remove address markers from tp headers

31 files changed, 435 insertions, 435 deletions

diff --git a/include/JSystem/J3DGraphBase/J3DTevs.h b/include/JSystem/J3DGraphBase/J3DTevs.h
index bb4f7131..fbb3d6c9 100644
--- a/include/JSystem/J3DGraphBase/J3DTevs.h
+++ b/include/JSystem/J3DGraphBase/J3DTevs.h
@@ -129,8 +129,8 @@ struct J3DTevSwapModeTable {
 
 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) {
diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/include/JSystem/J3DGraphBase/J3DVertex.h
index f6252a53..74b4c983 100644
--- a/include/JSystem/J3DGraphBase/J3DVertex.h
+++ b/include/JSystem/J3DGraphBase/J3DVertex.h
@@ -11,7 +11,7 @@ class J3DAnmVtxColor;
 class J3DVertexBuffer;
 
 struct J3DVtxColorCalc {
-    /* 8032E180 */ void calc(J3DModel*);
+    void calc(J3DModel*);
     virtual void calc(J3DVertexBuffer*);
 
     /* 0x0 */ void* vtable;  // inlined vtable?
diff --git a/include/JSystem/J3DGraphLoader/J3DClusterLoader.h b/include/JSystem/J3DGraphLoader/J3DClusterLoader.h
index 35a79ddb..bfe8d1df 100644
--- a/include/JSystem/J3DGraphLoader/J3DClusterLoader.h
+++ b/include/JSystem/J3DGraphLoader/J3DClusterLoader.h
@@ -3,7 +3,7 @@
 
 
 struct J3DClusterLoaderDataBase {
-    /* 80334130 */ static void* load(void const*);
+    static void* load(void const*);
 };
 
 #endif /* J3DCLUSTERLOADER_H */
diff --git a/include/JSystem/J3DGraphLoader/J3DJointFactory.h b/include/JSystem/J3DGraphLoader/J3DJointFactory.h
index 2c7653b2..cd90b029 100644
--- a/include/JSystem/J3DGraphLoader/J3DJointFactory.h
+++ b/include/JSystem/J3DGraphLoader/J3DJointFactory.h
@@ -29,8 +29,8 @@ struct J3DJointBlock {
 };
 
 struct J3DJointFactory {
-    /* 80337178 */ J3DJointFactory(J3DJointBlock const&);
-    /* 803371D0 */ J3DJoint* create(int);
+    J3DJointFactory(J3DJointBlock const&);
+    J3DJoint* create(int);
 
     J3DJointInitData* mJointInitData;
     u16* mIndexTable;
diff --git a/include/JSystem/J3DGraphLoader/J3DShapeFactory.h b/include/JSystem/J3DGraphLoader/J3DShapeFactory.h
index 63df9092..f32c860d 100644
--- a/include/JSystem/J3DGraphLoader/J3DShapeFactory.h
+++ b/include/JSystem/J3DGraphLoader/J3DShapeFactory.h
@@ -49,14 +49,14 @@ struct J3DShapeBlock {
 };
 
 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/JSupport/JSUFileStream.h b/include/JSystem/JSupport/JSUFileStream.h
index 5fd0fbc1..b1432df0 100644
--- a/include/JSystem/JSupport/JSUFileStream.h
+++ b/include/JSystem/JSupport/JSUFileStream.h
@@ -10,11 +10,11 @@ public:
     virtual ~JSUFileInputStream() {}
 
     // 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/JSUMemoryStream.h b/include/JSystem/JSupport/JSUMemoryStream.h
index fe1eb57b..de5135ed 100644
--- a/include/JSystem/JSupport/JSUMemoryStream.h
+++ b/include/JSystem/JSupport/JSUMemoryStream.h
@@ -7,12 +7,12 @@ class JSUMemoryInputStream : public JSURandomInputStream {
 public:
     JSUMemoryInputStream(const void* res, u32 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;
 
 private:
     /* 0x08 */ const void* mBuffer;
diff --git a/include/JSystem/JUtility/JUTCacheFont.h b/include/JSystem/JUtility/JUTCacheFont.h
index 862250de..84a5d9fb 100644
--- a/include/JSystem/JUtility/JUTCacheFont.h
+++ b/include/JSystem/JUtility/JUTCacheFont.h
@@ -33,24 +33,24 @@ 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(TGlyphCacheInfo*, TCachePage*, int*, int*);
-    /* 802DDD98 */ TCachePage* loadCache_char_subroutine(int*, bool);
-    /* 802DDEE0 */ void invalidiateAllCache();
-    /* 802DDF68 */ void unlink(TGlyphCacheInfo*);
-    /* 802DDFAC */ void prepend(TGlyphCacheInfo*);
+    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(TGlyphCacheInfo*, TCachePage*, int*, int*);
+    TCachePage* loadCache_char_subroutine(int*, bool);
+    void invalidiateAllCache();
+    void unlink(TGlyphCacheInfo*);
+    void prepend(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; }
     GXTexObj* getTexObj(void* buffer) { return &((TCachePage*)buffer)->mTexObj; }
diff --git a/include/JSystem/JUtility/JUTDbPrint.h b/include/JSystem/JUtility/JUTDbPrint.h
index d4b68306..a9f97df1 100644
--- a/include/JSystem/JUtility/JUTDbPrint.h
+++ b/include/JSystem/JUtility/JUTDbPrint.h
@@ -17,13 +17,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/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h
index 805f2a23..9753ba2d 100644
--- a/include/JSystem/JUtility/JUTDirectPrint.h
+++ b/include/JSystem/JUtility/JUTDirectPrint.h
@@ -12,20 +12,20 @@ namespace std {
 
 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*, std::__tag_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*, std::__tag_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();
 
     void* getFrameBuffer() { return field_0x00; }
     bool isActive() const { return field_0x00 != 0; }
diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h
index f2f9b5aa..ba98b027 100644
--- a/include/JSystem/JUtility/JUTException.h
+++ b/include/JSystem/JUtility/JUTException.h
@@ -15,7 +15,7 @@ class JUTDirectPrint;
 
 class JUTExternalFB {
 public:
-    /* 802E40CC */ JUTExternalFB(_GXRenderModeObj*, GXGamma, void*, u32);
+    JUTExternalFB(_GXRenderModeObj*, GXGamma, void*, u32);
 
 private:
     /* 0x00 */ _GXRenderModeObj* mRenderMode;
@@ -55,39 +55,39 @@ public:
         /* 0x14 */
     };
 
-    /* 802E1D5C */ JUTException(JUTDirectPrint*);
-    /* 802E40EC */ 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();
-
-    /* 802E1EA8 */ /* vt[03] */ 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 OSErrorHandler setPreUserCallback(OSErrorHandler);
-    /* 802E3AFC */ static OSErrorHandler setPostUserCallback(OSErrorHandler);
-    /* 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,
+    JUTException(JUTDirectPrint*);
+    virtual ~JUTException() {};
+
+    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();
+
+    /* vt[03] */ virtual void* run();
+
+    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 OSErrorHandler setPreUserCallback(OSErrorHandler);
+    static OSErrorHandler setPostUserCallback(OSErrorHandler);
+    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 1bdd62d2..67398c76 100644
--- a/include/JSystem/JUtility/JUTFader.h
+++ b/include/JSystem/JUtility/JUTFader.h
@@ -11,14 +11,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/JUTProcBar.h b/include/JSystem/JUtility/JUTProcBar.h
index 99d94e11..c67d5c5f 100644
--- a/include/JSystem/JUtility/JUTProcBar.h
+++ b/include/JSystem/JUtility/JUTProcBar.h
@@ -10,7 +10,7 @@ class JUTProcBar {
 public:
     class CTime {
     public:
-        /* 802E7340 */ CTime() { clear(); }
+        CTime() { clear(); }
 
         void clear() {
             mCost = 0;
@@ -67,17 +67,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/JUTVideo.h b/include/JSystem/JUtility/JUTVideo.h
index 1cf622b5..416b2b6f 100644
--- a/include/JSystem/JUtility/JUTVideo.h
+++ b/include/JSystem/JUtility/JUTVideo.h
@@ -16,16 +16,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->fb_width; }
     u16 getEfbHeight() const { return mRenderObj->efb_height; }
diff --git a/include/JSystem/JUtility/JUTXfb.h b/include/JSystem/JUtility/JUTXfb.h
index 6ceeb6a0..37c9e71b 100644
--- a/include/JSystem/JUtility/JUTXfb.h
+++ b/include/JSystem/JUtility/JUTXfb.h
@@ -15,14 +15,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(const _GXRenderModeObj*, 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(const _GXRenderModeObj*, 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/d/d_attention.h b/include/d/d_attention.h
index c34dbbf7..0c66ecc3 100644
--- a/include/d/d_attention.h
+++ b/include/d/d_attention.h
@@ -107,7 +107,7 @@ public:
 
 class dAttDraw_CallBack_c : public mDoExt_McaMorfCallBack1_c {
 public:
-    /* 80070178 */ virtual void execute(u16, J3DTransformInfo*);
+    virtual void execute(u16, J3DTransformInfo*);
 };
 
 class daPy_lk_c;
diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h
index a1125fd0..8593708f 100644
--- a/include/d/d_bg_s_acch.h
+++ b/include/d/d_bg_s_acch.h
@@ -73,40 +73,40 @@ 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*, unsigned int);
-    /* 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();
-    /* 800D00D0 */ bool ChkRoofHit() const;
-    /* 800D00DC */ void ClrGroundHit();
-    /* 80141404 */ bool ChkGroundHit() const;
-
-    /* 80075F94 */ virtual ~dBgS_Acch();
+    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*, unsigned int);
+    void SetWallPolyIndex(int, int);
+    void CalcMovePosWork();
+    void CalcWallRR();
+    void SetMoveBGOnly();
+    void ClrMoveBGOnly();
+    void SetGndThinCellingOff();
+    void ClrGndThinCellingOff();
+    bool ChkGndThinCellingOff();
+    void OnWallSort();
+    bool ChkWallSort();
+    bool ChkLineDown();
+    bool ChkRoofHit() const;
+    void ClrGroundHit();
+    bool ChkGroundHit() const;
+
+    virtual ~dBgS_Acch();
 
     cXyz* GetPos() { return pm_pos; }
     cXyz* GetOldPos() { return pm_old_pos; }
@@ -196,7 +196,7 @@ class dBgS_LinkAcch : public dBgS_Acch {
 public:
     dBgS_LinkAcch() { SetLink(); }
 
-    /* 80140F30 */ virtual ~dBgS_LinkAcch() {}
+    virtual ~dBgS_LinkAcch() {}
 };
 
 class dBgS_ObjAcch : public dBgS_Acch {
@@ -205,7 +205,7 @@ public:
         SetObj();
     }
 
-    /* 80BB336C */ virtual ~dBgS_ObjAcch() {}
+    virtual ~dBgS_ObjAcch() {}
 };  // Size: 0x1C4
 
 #endif /* D_BG_D_BG_S_ACCH_H */
\ No newline at end of file
diff --git a/include/d/d_bg_s_gnd_chk.h b/include/d/d_bg_s_gnd_chk.h
index de2c971c..59fc5205 100644
--- a/include/d/d_bg_s_gnd_chk.h
+++ b/include/d/d_bg_s_gnd_chk.h
@@ -6,11 +6,11 @@
 
 class dBgS_GndChk : public cBgS_GndChk, public dBgS_Chk {
 public:
-    /* 8007757C */ dBgS_GndChk() {
+    dBgS_GndChk() {
         SetPolyPassChk(GetPolyPassChkInfo());
         SetGrpPassChk(GetGrpPassChkInfo());
     }
-    /* 800775F0 */ virtual ~dBgS_GndChk() {}
+    virtual ~dBgS_GndChk() {}
 };  // Size: 0x54
 
 STATIC_ASSERT(sizeof(dBgS_GndChk) == 0x54);
@@ -18,33 +18,33 @@ STATIC_ASSERT(sizeof(dBgS_GndChk) == 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(); }
 };
@@ -53,14 +53,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 */
\ No newline at end of file
diff --git a/include/d/d_bg_s_grp_pass_chk.h b/include/d/d_bg_s_grp_pass_chk.h
index 703607fb..eacc9b76 100644
--- a/include/d/d_bg_s_grp_pass_chk.h
+++ b/include/d/d_bg_s_grp_pass_chk.h
@@ -15,9 +15,9 @@ public:
         LIGHT_GRP  = 0x10,
     };
 
-    /* 80077BA0 */ dBgS_GrpPassChk() { mGrp = NORMAL_GRP; }
+    dBgS_GrpPassChk() { mGrp = NORMAL_GRP; }
 
-    /* 80077BC4 */ virtual ~dBgS_GrpPassChk() {}
+    virtual ~dBgS_GrpPassChk() {}
 
     void OnNormalGrp() { mGrp |= NORMAL_GRP; }
     void OnWaterGrp() { mGrp |= WATER_GRP; }
diff --git a/include/d/d_bg_s_lin_chk.h b/include/d/d_bg_s_lin_chk.h
index 0d578529..bb11892e 100644
--- a/include/d/d_bg_s_lin_chk.h
+++ b/include/d/d_bg_s_lin_chk.h
@@ -8,13 +8,13 @@ class fopAc_ac_c;
 
 class dBgS_LinChk : public cBgS_LinChk, public dBgS_Chk {
 public:
-    /* 80077C68 */ dBgS_LinChk() {
+    dBgS_LinChk() {
         SetPolyPassChk(GetPolyPassChkInfo());
         SetGrpPassChk(GetGrpPassChkInfo());
     }
-    /* 80077D64 */ void Set(cXyz* pi_start, cXyz* pi_end, fopAc_ac_c*);
+    void Set(cXyz* pi_start, cXyz* pi_end, fopAc_ac_c*);
 
-    /* 80077CDC */ virtual ~dBgS_LinChk() {}
+    virtual ~dBgS_LinChk() {}
 
     /* 0x00 cBgS_LinChk */;
     /* 0x58 dBgS_Chk */;
@@ -22,62 +22,62 @@ 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() {
         SetArrow(); // Don't check arrows
         OnYoganGrp(); // Check lava
         OnNormalGrp();
     }
 
-    /* 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_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();
 };
 
 class dBgS_MirLightLinChk : public dBgS_LinChk {
diff --git a/include/d/d_bg_s_roof_chk.h b/include/d/d_bg_s_roof_chk.h
index fb234e05..e3e4affe 100644
--- a/include/d/d_bg_s_roof_chk.h
+++ b/include/d/d_bg_s_roof_chk.h
@@ -7,11 +7,11 @@
 
 class dBgS_RoofChk : public cBgS_PolyInfo, public cBgS_Chk, public dBgS_Chk {
 public:
-    /* 80078FF4 */ dBgS_RoofChk();
-    /* 80079124 */ void Init();
-    /* 800B146C */ void SetPos(cXyz const&);
+    dBgS_RoofChk();
+    void Init();
+    void SetPos(cXyz const&);
 
-    /* 80079090 */ virtual ~dBgS_RoofChk();
+    virtual ~dBgS_RoofChk();
 
     void i_SetPos(cXyz const& pos) { m_pos = pos; }
     cXyz* GetPosP() { return &m_pos; }
@@ -25,7 +25,7 @@ STATIC_ASSERT(sizeof(dBgS_RoofChk) == 0x44);
 class dBgS_LinkRoofChk : public dBgS_RoofChk {
 public:
     dBgS_LinkRoofChk() { /* SetLink(); */ }
-    /* 80140E40 */ virtual ~dBgS_LinkRoofChk();
+    virtual ~dBgS_LinkRoofChk();
 };
 
 #endif /* D_BG_D_BG_S_ROOF_CHK_H */
\ No newline at end of file
diff --git a/include/d/d_bg_s_spl_grp_chk.h b/include/d/d_bg_s_spl_grp_chk.h
index f9df12a9..cae1c1af 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 5069ae1a..f9c210c2 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: 0x50
 
 STATIC_ASSERT(sizeof(dBgS_WtrChk) == 0x50);
diff --git a/include/d/d_cc_mass_s.h b/include/d/d_cc_mass_s.h
index 86dabb43..3f8e1584 100644
--- a/include/d/d_cc_mass_s.h
+++ b/include/d/d_cc_mass_s.h
@@ -67,15 +67,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 */ u8 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);
+    u8 GetResultCam() const;
+    void GetCamTopPos(Vec* p_out);
 };
 
 STATIC_ASSERT(sizeof(dCcMassS_Mng) == 0x1A0);
diff --git a/include/d/d_cc_s.h b/include/d/d_cc_s.h
index 5b24cd12..9041929a 100644
--- a/include/d/d_cc_s.h
+++ b/include/d/d_cc_s.h
@@ -11,39 +11,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 */ int 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*,
+    void DrawAfter();
+    void Move();
+    void Draw();
+    void MassClear();
+    int ChkAtTgMtrlHit(u8, u8);
+
+    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 PrepareMass() { mMass_Mng.Prepare(); }
diff --git a/include/d/d_save.h b/include/d/d_save.h
index 2cdab030..c75f0548 100644
--- a/include/d/d_save.h
+++ b/include/d/d_save.h
@@ -6,7 +6,7 @@
 
 class dSv_player_status_a_c {
 public:
-    /* 800589A8 */ void init();
+    void init();
   
     u8 getSelectEquip(int i_no) { return mSelectEquip[i_no]; }
     u8 getWalletSize() { return mWalletSize; }
@@ -77,16 +77,16 @@ STATIC_ASSERT(sizeof(dSv_player_return_place_c) == 0xC);
 
 class dSv_player_item_c {
 public:
-    /* 80058C60 */ void init();
-    /* 80058C7C */ void setBottleItemIn(u8, u8);
-    /* 80058E1C */ void setEmptyBottleItemIn(u8);
-    /* 80058E44 */ void setEmptyBottle();
-    /* 800591B0 */ void setEquipBottleItemIn(u8);
-    /* 80058F74 */ void setEquipBottleItemIn(u8, u8);
-    /* 80059408 */ void setEquipBottleItemEmpty();
-    /* 8005918C */ void setEquipBottleItemEmpty(u8);
-    /* 8005942C */ u8 checkBottle(u8);
-    /* 8005946C */ u8 checkEmptyBottle();
+    void init();
+    void setBottleItemIn(u8, u8);
+    void setEmptyBottleItemIn(u8);
+    void setEmptyBottle();
+    void setEquipBottleItemIn(u8);
+    void setEquipBottleItemIn(u8, u8);
+    void setEquipBottleItemEmpty();
+    void setEquipBottleItemEmpty(u8);
+    u8 checkBottle(u8);
+    u8 checkEmptyBottle();
 
     u8 getItem(int i_idx) const { return mItems[i_idx]; }
 
@@ -97,11 +97,11 @@ STATIC_ASSERT(sizeof(dSv_player_item_c) == 0x15);
 
 class dSv_player_get_item_c {
 public:
-    /* 800594A8 */ void init();
-    /* 800594C4 */ void onItem(int, u8);
-    /* 8005955C */ BOOL isItem(int, u8);
-    /* 800595F8 */ void onBottleItem(u8);
-    /* 80059740 */ bool isBottleItem(u8);
+    void init();
+    void onItem(int, u8);
+    BOOL isItem(int, u8);
+    void onBottleItem(u8);
+    bool isBottleItem(u8);
 
     /* 0x0 */ u8 mItemFlags[21];
 };  // Size: 0x15
@@ -110,10 +110,10 @@ STATIC_ASSERT(sizeof(dSv_player_get_item_c) == 0x15);
 
 class dSv_player_item_record_c {
 public:
-    /* 80059848 */ void init();
-    /* 8005987C */ void resetTimer(u16);
-    /* 80059894 */ void decTimer();
-    /* 800598D0 */ u16 getTimer();
+    void init();
+    void resetTimer(u16);
+    void decTimer();
+    u16 getTimer();
 
     u32 getArrowNum() const { return mArrowNum; }
     u32 getBombNum() const { return mBombNum; }
@@ -129,7 +129,7 @@ STATIC_ASSERT(sizeof(dSv_player_item_record_c) == 0x8);
 
 class dSv_player_item_max_c {
 public:
-    /* 800598D8 */ void init();
+    void init();
 
     u8 getArrowNum() const { return mArrowNum; }
     u8 getBombNum() const { return mBombNum; }
@@ -144,24 +144,24 @@ STATIC_ASSERT(sizeof(dSv_player_item_max_c) == 0x8);
 
 class dSv_player_bag_item_c {
 public:
-    /* 80059908 */ void init();
-    /* 80059968 */ void setBeastItem(u8);
-    /* 800599D8 */ void setBeastItemEmpty(u8);
-    /* 80059C30 */ bool checkBeastItem(u8);
-    /* 80059C60 */ void setBaitItemChange(u8);
-    /* 80059EB0 */ void setBaitItemChange(u8, u8);
-    /* 8005A1A4 */ void setBaitItemEmpty(u8);
-    /* 8005A0C8 */ void setBaitItemEmpty();
-    /* 8005A248 */ void setBaitItem(u8);
-    /* 8005A2D0 */ u8 checkBaitItemEmpty();
-    /* 8005A2F4 */ u8 checkBaitItem(u8);
-    /* 8005A584 */ void setReserveItemChange(u8, u8);
-    /* 8005A334 */ void setReserveItemChange(u8);
-    /* 8005A7C0 */ void setReserveItemEmpty(u8);
-    /* 8005A79C */ void setReserveItemEmpty();
-    /* 8005A7E4 */ void setReserveItem(u8);
-    /* 8005A854 */ bool checkReserveItemEmpty();
-    /* 8005A878 */ bool checkReserveItem(u8);
+    void init();
+    void setBeastItem(u8);
+    void setBeastItemEmpty(u8);
+    bool checkBeastItem(u8);
+    void setBaitItemChange(u8);
+    void setBaitItemChange(u8, u8);
+    void setBaitItemEmpty(u8);
+    void setBaitItemEmpty();
+    void setBaitItem(u8);
+    u8 checkBaitItemEmpty();
+    u8 checkBaitItem(u8);
+    void setReserveItemChange(u8, u8);
+    void setReserveItemChange(u8);
+    void setReserveItemEmpty(u8);
+    void setReserveItemEmpty();
+    void setReserveItem(u8);
+    bool checkReserveItemEmpty();
+    bool checkReserveItem(u8);
 
     u8 getBeast(int i_idx) const { return mBeast[i_idx]; }
     u8 getBait(int i_idx) const { return mBait[i_idx]; }
@@ -176,13 +176,13 @@ STATIC_ASSERT(sizeof(dSv_player_bag_item_c) == 0x18);
 
 class dSv_player_get_bag_item_c {
 public:
-    /* 8005A8B8 */ void init();
-    /* 8005A8CC */ void onBeast(u8);
-    /* 8005A960 */ BOOL isBeast(u8);
-    /* 8005A9F8 */ void onBait(u8);
-    /* 8005AA8C */ BOOL isBait(u8);
-    /* 8005AB24 */ void onReserve(u8);
-    /* 8005ABB4 */ BOOL isReserve(u8);
+    void init();
+    void onBeast(u8);
+    BOOL isBeast(u8);
+    void onBait(u8);
+    BOOL isBait(u8);
+    void onReserve(u8);
+    BOOL isReserve(u8);
 
     /* 0x0 */ u32 mReserveFlags;
     /* 0x4 */ u8 mBeastFlags;
@@ -194,7 +194,7 @@ STATIC_ASSERT(sizeof(dSv_player_get_bag_item_c) == 0xC);
 
 class dSv_player_bag_item_record_c {
 public:
-    /* 8005AC48 */ void init();
+    void init();
 
     u8 getBeastNum(int i_idx) const { return mBeastNum[i_idx]; }
     u8 getBaitNum(int i_idx) const { return mBaitNum[i_idx]; }
@@ -209,17 +209,17 @@ STATIC_ASSERT(sizeof(dSv_player_bag_item_record_c) == 0x18);
 
 class dSv_player_collect_c {
 public:
-    /* 8005ACA8 */ void init();
-    /* 8005ACE0 */ void onCollect(int, u8);
-    /* 8005AD78 */ void offCollect(int, u8);
-    /* 8005AE10 */ BOOL isCollect(int, u8);
-    /* 8005AEAC */ void onTact(u8);
-    /* 8005AF40 */ BOOL isTact(u8);
-    /* 8005AFD8 */ void onTriforce(u8);
-    /* 8005B06C */ BOOL isTriforce(u8);
-    /* 8005B104 */ void onSymbol(u8);
-    /* 8005B198 */ BOOL isSymbol(u8);
-    /* 8005B230 */ int getTriforceNum();
+    void init();
+    void onCollect(int, u8);
+    void offCollect(int, u8);
+    BOOL isCollect(int, u8);
+    void onTact(u8);
+    BOOL isTact(u8);
+    void onTriforce(u8);
+    BOOL isTriforce(u8);
+    void onSymbol(u8);
+    BOOL isSymbol(u8);
+    int getTriforceNum();
 
     /* 0x0 */ u8 field_0x0[8];
     /* 0x8 */ u8 field_0x8;
@@ -233,25 +233,25 @@ STATIC_ASSERT(sizeof(dSv_player_collect_c) == 0xD);
 
 class dSv_player_map_c {
 public:
-    /* 8005B290 */ void init();
-    /* 8005B320 */ void onGetMap(int);
-    /* 8005B3CC */ BOOL isGetMap(int);
-    /* 8005B47C */ void onOpenMap(int);
-    /* 8005B528 */ void offOpenMap(int);
-    /* 8005B5D4 */ BOOL isOpenMap(int);
-    /* 8005B684 */ void onCompleteMap(int);
-    /* 8005B730 */ void offCompleteMap(int);
-    /* 8005B7DC */ BOOL isCompleteMap(int);
-    /* 8005B88C */ void onTriforce(int);
-    /* 8005B92C */ void offTriforce(int);
-    /* 8005B9CC */ BOOL isTriforce(int);
-    /* 8005BA70 */ int getCollectMapNum();
-    /* 8005BAE8 */ void onFmapBit(int, u8);
-    /* 8005BB84 */ BOOL isFmapBit(int, u8);
-    /* 8005BC24 */ void onSaveArriveGrid(int);
-    /* 8005BCBC */ BOOL isSaveArriveGrid(int);
-    /* 8005BD54 */ void onSaveArriveGridForAgb(int);
-    /* 8005BDEC */ BOOL isSaveArriveGridForAgb(int);
+    void init();
+    void onGetMap(int);
+    BOOL isGetMap(int);
+    void onOpenMap(int);
+    void offOpenMap(int);
+    BOOL isOpenMap(int);
+    void onCompleteMap(int);
+    void offCompleteMap(int);
+    BOOL isCompleteMap(int);
+    void onTriforce(int);
+    void offTriforce(int);
+    BOOL isTriforce(int);
+    int getCollectMapNum();
+    void onFmapBit(int, u8);
+    BOOL isFmapBit(int, u8);
+    void onSaveArriveGrid(int);
+    BOOL isSaveArriveGrid(int);
+    void onSaveArriveGridForAgb(int);
+    BOOL isSaveArriveGridForAgb(int);
 
     /* 0x00 */ u32 field_0x0[4][4];
     /* 0x40 */ u8 field_0x40[49];
@@ -264,7 +264,7 @@ STATIC_ASSERT(sizeof(dSv_player_map_c) == 0x84);
 
 class dSv_player_info_c {
 public:
-    /* 8005BE84 */ void init();
+    void init();
 
     const char* getPlayerName() const { return mPlayerName; }
 
@@ -284,8 +284,8 @@ STATIC_ASSERT(sizeof(dSv_player_info_c) == 0x5C);
 
 class dSv_player_config_c {
 public:
-    /* 8005BF2C */ void init();
-    /* 8005BFA4 */ s32 checkVibration();
+    void init();
+    s32 checkVibration();
 
     u8 getVibration() const { return mVibration; }
 
@@ -300,8 +300,8 @@ STATIC_ASSERT(sizeof(dSv_player_config_c) == 0x5);
 
 class dSv_player_priest_c {
 public:
-    /* 8005BFC8 */ void init();
-    /* 8005BFD4 */ void set(u8, cXyz&, s16, s8);
+    void init();
+    void set(u8, cXyz&, s16, s8);
 
     /* 0x0 */ cXyz field_0x0;
     /* 0xC */ s16 field_0xc;
@@ -313,7 +313,7 @@ STATIC_ASSERT(sizeof(dSv_player_priest_c) == 0x10);
 
 class dSv_player_status_c_c {
 public:
-    /* 8005BFFC */ void init();
+    void init();
 
     /* 0x00 */ dSv_player_status_a_c mRecollectStatusA;
     /* 0x18 */ dSv_player_item_c mRecollectItem;
@@ -328,7 +328,7 @@ STATIC_ASSERT(sizeof(dSv_player_status_c_c) == 0x70);
 
 class dSv_player_c {
 public:
-    /* 8005C000 */ void init();
+    void init();
 
     dSv_player_status_a_c& getPlayerStatusA() { return mPlayerStatusA; }
     dSv_player_status_a_c* getpPlayerStatusA() { return &mPlayerStatusA; }
@@ -409,19 +409,19 @@ public:
         /* 0x7 */ STAGE_BOSS_ENEMY_2 = 7
     };
 
-    /* 8005C094 */ void init();
-    /* 8005C0EC */ void onTbox(int);
-    /* 8005C188 */ BOOL isTbox(int);
-    /* 8005C228 */ void onSwitch(int);
-    /* 8005C2D4 */ void offSwitch(int);
-    /* 8005C380 */ BOOL isSwitch(int);
-    /* 8005C430 */ BOOL revSwitch(int);
-    /* 8005C4EC */ void onItem(int);
-    /* 8005C598 */ BOOL isItem(int);
-    /* 8005C648 */ void onVisitedRoom(int);
-    /* 8005C6F4 */ BOOL isVisitedRoom(int);
-    /* 8005C7A4 */ void onDungeonItem(int);
-    /* 8005C844 */ BOOL isDungeonItem(int);
+    void init();
+    void onTbox(int);
+    BOOL isTbox(int);
+    void onSwitch(int);
+    void offSwitch(int);
+    BOOL isSwitch(int);
+    BOOL revSwitch(int);
+    void onItem(int);
+    BOOL isItem(int);
+    void onVisitedRoom(int);
+    BOOL isVisitedRoom(int);
+    void onDungeonItem(int);
+    BOOL isDungeonItem(int);
 
     u8 getKeyNum() { return mKeyNum; }
     void setKeyNum(u8 i_keyNum) { mKeyNum = i_keyNum; }
@@ -449,9 +449,9 @@ STATIC_ASSERT(sizeof(dSv_memBit_c) == 0x24);
 
 class dSv_ocean_c {
 public:
-    /* 8005C8E8 */ void init();
-    /* 8005C908 */ void onOceanSvBit(u8 i_grid, u16 i_bit);
-    /* 8005C9E8 */ BOOL isOceanSvBit(u8 i_grid, u16 i_bit);
+    void init();
+    void onOceanSvBit(u8 i_grid, u16 i_bit);
+    BOOL isOceanSvBit(u8 i_grid, u16 i_bit);
 
     /* 0x0 */ u16 field_0x0[50];
 };
@@ -460,12 +460,12 @@ STATIC_ASSERT(sizeof(dSv_ocean_c) == 0x64);
 
 class dSv_event_c {
 public:
-    /* 8005CACC */ void init();
-    /* 8005CB04 */ void onEventBit(u16);
-    /* 8005CB1C */ void offEventBit(u16);
-    /* 8005CB34 */ BOOL isEventBit(u16);
-    /* 8005CB58 */ void setEventReg(u16, u8);
-    /* 8005CB7C */ u8 getEventReg(u16);
+    void init();
+    void onEventBit(u16);
+    void offEventBit(u16);
+    BOOL isEventBit(u16);
+    void setEventReg(u16, u8);
+    u8 getEventReg(u16);
 
     /* 0x0 */ u8 mFlags[0x100];
 };  // Size: 0x100
@@ -474,7 +474,7 @@ STATIC_ASSERT(sizeof(dSv_event_c) == 0x100);
 
 class dSv_reserve_c {
 public:
-    /* 8005CB94 */ void init();
+    void init();
 
     /* 0x0 */ u8 mReserve[0x50];
 };  // Size: 0x50
@@ -482,7 +482,7 @@ public:
 class dSv_memory_c {
 public:
     dSv_memory_c() { init(); }
-    /* 8005CBB0 */ void init();
+    void init();
 
     dSv_memBit_c& getBit() { return mMembit; }
     const dSv_memBit_c& getBit() const { return mMembit; }
@@ -494,11 +494,11 @@ STATIC_ASSERT(sizeof(dSv_memory_c) == 0x24);
 
 class dSv_danBit_c {
 public:
-    /* 8005CBD0 */ int init(s8);
-    /* 8005CC08 */ void onSwitch(int);
-    /* 8005CCB4 */ void offSwitch(int);
-    /* 8005CD60 */ BOOL isSwitch(int);
-    /* 8005CE10 */ BOOL revSwitch(int);
+    int init(s8);
+    void onSwitch(int);
+    void offSwitch(int);
+    BOOL isSwitch(int);
+    BOOL revSwitch(int);
 
     u8 getGbaRupeeCount() { return mGbaRupeeCount; }
     void incGbaRupeeCount() { mGbaRupeeCount++; }
@@ -510,14 +510,14 @@ public:
 
 class dSv_zoneBit_c {
 public:
-    /* 8005CECC */ void init();
-    /* 8005CEF4 */ void clearRoomSwitch();
-    /* 8005CF00 */ void onSwitch(int);
-    /* 8005CFAC */ void offSwitch(int);
-    /* 8005D054 */ BOOL isSwitch(int);
-    /* 8005D100 */ BOOL revSwitch(int);
-    /* 8005D1B8 */ void onItem(int);
-    /* 8005D254 */ BOOL isItem(int);
+    void init();
+    void clearRoomSwitch();
+    void onSwitch(int);
+    void offSwitch(int);
+    BOOL isSwitch(int);
+    BOOL revSwitch(int);
+    void onItem(int);
+    BOOL isItem(int);
 
     static const int SWITCH_MAX = 48;
 
@@ -527,9 +527,9 @@ public:
 
 class dSv_zoneActor_c {
 public:
-    /* 8005D2F4 */ void init();
-    /* 8005D314 */ void on(int);
-    /* 8005D3BC */ BOOL is(int);
+    void init();
+    void on(int);
+    BOOL is(int);
 
     static const int ACTOR_MAX = 512;
 
@@ -539,7 +539,7 @@ public:
 class dSv_zone_c {
 public:
     dSv_zone_c() { mRoomNo = -1; }
-    /* 8005D468 */ void init(int);
+    void init(int);
 
     dSv_zoneBit_c& getZoneBit() { return mZoneBit; }
     const dSv_zoneBit_c& getBit() const { return mZoneBit; }
@@ -555,9 +555,9 @@ public:
 
 class dSv_restart_c {
 public:
-    /* 8005D4A4 */ void setRoom(cXyz const&, s16, s8);
-    /* 8005D4C8 */ void setRestartOption(s8);
-    /* 8005D584 */ void setRestartOption(s8, cXyz*, s16, s8);
+    void setRoom(cXyz const&, s16, s8);
+    void setRestartOption(s8);
+    void setRestartOption(s8, cXyz*, s16, s8);
 
     void setRoomParam(u32 param) { mRestartParam = param; }
     void setStartPoint(s16 point) { mStartCode = point; }
@@ -612,7 +612,7 @@ public:
 
 class dSv_save_c {
 public:
-    /* 8005D860 */ void init();
+    void init();
 
     dSv_player_c& getPlayer() { return mPlayer; }
     dSv_ocean_c& getOcean() { return mOcean; }
diff --git a/include/f_ap/f_ap_game.h b/include/f_ap/f_ap_game.h
index 66e4fa6c..77a68a77 100644
--- a/include/f_ap/f_ap_game.h
+++ b/include/f_ap/f_ap_game.h
@@ -9,8 +9,8 @@ void fapGm_Execute();
 
 class fapGm_HIO_c {
 public:
-    /* 80018944 */ fapGm_HIO_c();
-    /* 80018AE0 */ virtual ~fapGm_HIO_c();
+    fapGm_HIO_c();
+    virtual ~fapGm_HIO_c();
 
     /* 0x04 */ u8 field_0x04[0x06 - 0x04];
     /* 0x06 */ u8 mDisplayMeter;
diff --git a/include/m_Do/m_Do_MemCard.h b/include/m_Do/m_Do_MemCard.h
index a32ad8e3..0cd615e1 100644
--- a/include/m_Do/m_Do_MemCard.h
+++ b/include/m_Do/m_Do_MemCard.h
@@ -15,27 +15,27 @@ public:
         CARD_DETACH,
     };
 
-    /* 8001672C */ mDoMemCd_Ctrl_c();
-    /* 80016730 */ void ThdInit();
-    /* 800167D0 */ void main();
-    /* 80016894 */ void update();
-    /* 800169B4 */ void load();
-    /* 80016A0C */ void restore();
-    /* 80016AB0 */ s32 LoadSync(void*, u32, u32);
-    /* 80016B58 */ void save(void*, u32, u32);
-    /* 80016BD4 */ void store();
-    /* 80016CE0 */ s32 SaveSync();
-    /* 80016D74 */ u32 getStatus(u32);
-    /* 80016E58 */ void command_format();
-    /* 80016EA8 */ void format();
-    /* 80016F2C */ s32 FormatSync();
-    /* 80016FB8 */ void attach();
-    /* 800170B8 */ void command_attach();
-    /* 80017110 */ void detach();
-    /* 80017148 */ s32 mount();
-    /* 80017274 */ s32 loadfile();
-    /* 800172D4 */ s32 checkspace();
-    /* 80017360 */ void setCardState(s32);
+    mDoMemCd_Ctrl_c();
+    void ThdInit();
+    void main();
+    void update();
+    void load();
+    void restore();
+    s32 LoadSync(void*, u32, u32);
+    void save(void*, u32, u32);
+    void store();
+    s32 SaveSync();
+    u32 getStatus(u32);
+    void command_format();
+    void format();
+    s32 FormatSync();
+    void attach();
+    void command_attach();
+    void detach();
+    s32 mount();
+    s32 loadfile();
+    s32 checkspace();
+    void setCardState(s32);
 
     bool isCardCommNone() { return mCardCommand == CARD_NO_COMMAND; }
 
diff --git a/include/m_Do/m_Do_dvd_thread.h b/include/m_Do/m_Do_dvd_thread.h
index 3cc23672..f4d4013f 100644
--- a/include/m_Do/m_Do_dvd_thread.h
+++ b/include/m_Do/m_Do_dvd_thread.h
@@ -16,8 +16,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;
@@ -25,10 +25,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; }
     s32 getMemSize() const { return mDataSize; }
@@ -43,13 +43,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;
@@ -60,11 +60,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; }
 
@@ -78,10 +78,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; }
@@ -95,10 +95,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;
@@ -111,9 +111,9 @@ struct mDoDvdThdStack {
 } __attribute__((aligned(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 60febcf3..833e6c2e 100644
--- a/include/m_Do/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext.h
@@ -78,9 +78,9 @@ public:
         mpCRegAnm = NULL;
         mpKRegAnm = NULL;
     }
-    /* 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 i_end, bool i_modify, int i_entry);
-    /* 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);
@@ -107,11 +107,11 @@ STATIC_ASSERT(sizeof(mDoExt_brkAnm) == 0x18);
 class mDoExt_bckAnm : public mDoExt_baseAnm {
 public:
     mDoExt_bckAnm() { mpMtxCalc = NULL; }
-    /* 8000D7DC */ int init(J3DModelData * i_model, J3DAnmTransform* i_bck, int i_play, int i_attr,
+    int init(J3DModelData * i_model, J3DAnmTransform* i_bck, int i_play, int i_attr,
                             f32 i_rate, s16 i_startF, s16 i_endF1, 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);
 
     void entry(J3DModelData* i_modelData) { entry(i_modelData, getFrame()); }
 
@@ -134,12 +134,12 @@ STATIC_ASSERT(sizeof(mDoExt_bckAnm) == 0x10);
 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);
     int init(J3DModelData*, J3DAnmTexPattern*, int, int, float, short, short, bool, int);
     int init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, float, short, short, bool, int);
     void entry(J3DModelData* i_modelData, s16 i_frame);
-    /* 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()); }
 
@@ -159,7 +159,7 @@ private:
 
 class mDoExt_blkAnm : public mDoExt_baseAnm {
 public:
-    /* 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; }
@@ -196,8 +196,8 @@ private:
 
 class mDoExt_AnmRatioPack {
 public:
-    /* 80140DF0 */ ~mDoExt_AnmRatioPack();
-    /* 80140E2C */ mDoExt_AnmRatioPack();
+    ~mDoExt_AnmRatioPack();
+    mDoExt_AnmRatioPack();
 
     void setRatio(f32 ratio) { mRatio = ratio; }
     f32 getRatio() { return mRatio; }
@@ -222,8 +222,8 @@ private:
 
 class mDoExt_MtxCalcOldFrame {
 public:
-    /* 8000F848 */ void initOldFrameMorf(f32, u16, u16);
-    /* 8000F8CC */ void decOldFrameMorfCounter();
+    void initOldFrameMorf(f32, u16, u16);
+    void decOldFrameMorfCounter();
 
     f32 getOldFrameRate() { return mOldFrameRate; }
     J3DTransformInfo* getOldFrameTransInfo(int i) { return &mOldFrameTransInfo[i]; }
diff --git a/include/m_Do/m_Do_lib.h b/include/m_Do/m_Do_lib.h
index 9b204491..98495a18 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 */ void setup(f32, f32, f32, f32);
+    void setup(f32, f32, f32, f32);
 
     static void changeFar(f32 far) {
         mClipper.setFar(far);