remove address markers from tp headers

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) {

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?

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 */

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;

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;

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;

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;

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; }

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; }
 

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; }

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() {};
+    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();
+    /* 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,
+    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; }

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); }

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(); }

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; }

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; }