Annotate all data with DUSK_GAME_DATA (#2214)

The hope of auto-importing data via lld MinGW
+ pseudo_reloc is now dead thanks to ARM64,
so I just wrote a script to go annotate every
exported data symbol in the game instead.
This commit is contained in:
Luke Street
2026-07-14 13:49:21 -06:00
committed by GitHub
parent f5d30a886d
commit eed14acdc6
843 changed files with 4817 additions and 4821 deletions
@@ -892,7 +892,7 @@ struct J2DBlendInfo {
/* 0x3 */ u8 mOp;
};
extern const J2DBlendInfo j2dDefaultBlendInfo;
DUSK_GAME_EXTERN const J2DBlendInfo j2dDefaultBlendInfo;
/**
* @ingroup jsystem-j2d
@@ -201,7 +201,7 @@ public:
static s16 J2DCast_F32_to_S16(f32 value, u8 arg2);
static JGeometry::TBox2<f32> static_mBounds;
static DUSK_GAME_DATA JGeometry::TBox2<f32> static_mBounds;
public:
/* 0x04 */ u16 field_0x4;
@@ -67,8 +67,8 @@ public:
mFontSizeY = y;
}
static char* mStrBuff;
static size_t mStrBuffSize;
static DUSK_GAME_DATA char* mStrBuff;
static DUSK_GAME_DATA size_t mStrBuffSize;
private:
void private_initiate(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor,
@@ -90,7 +90,7 @@ public:
static J2DDataManage* getDataManage() { return mDataManage; }
static J2DDataManage* mDataManage;
static DUSK_GAME_DATA J2DDataManage* mDataManage;
/* 0x100 */ bool mScissor;
/* 0x102 */ u16 mMaterialNum;
+19 -19
View File
@@ -46,7 +46,7 @@ struct J2DTexMtxInfo {
}; // Size: 0x24
extern J2DTexMtxInfo const j2dDefaultTexMtxInfo;
DUSK_GAME_EXTERN J2DTexMtxInfo const j2dDefaultTexMtxInfo;
/**
* @ingroup jsystem-j2d
@@ -86,7 +86,7 @@ struct J2DIndTexOrderInfo {
GXTexMapID getTexMapID() const { return (GXTexMapID)mTexMapID; }
};
extern const J2DIndTexOrderInfo j2dDefaultIndTexOrderNull;
DUSK_GAME_EXTERN const J2DIndTexOrderInfo j2dDefaultIndTexOrderNull;
/**
* @ingroup jsystem-j2d
@@ -130,7 +130,7 @@ struct J2DIndTexMtxInfo {
}
};
extern J2DIndTexMtxInfo const j2dDefaultIndTexMtxInfo;
DUSK_GAME_EXTERN J2DIndTexMtxInfo const j2dDefaultIndTexMtxInfo;
/**
* @ingroup jsystem-j2d
@@ -175,7 +175,7 @@ struct J2DIndTexCoordScaleInfo {
GXIndTexScale getScaleT() const { return (GXIndTexScale)mScaleT; }
};
extern const J2DIndTexCoordScaleInfo j2dDefaultIndTexCoordScaleInfo;
DUSK_GAME_EXTERN const J2DIndTexCoordScaleInfo j2dDefaultIndTexCoordScaleInfo;
/**
* @ingroup jsystem-j2d
@@ -239,7 +239,7 @@ inline u32 J2DCalcIndTevStage(J2DIndTevStageInfo info) {
(info.mBiasSel << 4) | (info.mIndFormat << 2) | (info.mIndStage);
}
extern const J2DIndTevStageInfo j2dDefaultIndTevStageInfo;
DUSK_GAME_EXTERN const J2DIndTevStageInfo j2dDefaultIndTevStageInfo;
/**
* @ingroup jsystem-j2d
@@ -289,7 +289,7 @@ struct J2DTexCoordInfo {
}
};
extern J2DTexCoordInfo const j2dDefaultTexCoordInfo[8];
DUSK_GAME_EXTERN J2DTexCoordInfo const j2dDefaultTexCoordInfo[8];
/**
* @ingroup jsystem-j2d
@@ -332,7 +332,7 @@ struct J2DTevOrderInfo {
}
};
extern const J2DTevOrderInfo j2dDefaultTevOrderInfoNull;
DUSK_GAME_EXTERN const J2DTevOrderInfo j2dDefaultTevOrderInfoNull;
/**
* @ingroup jsystem-j2d
@@ -383,7 +383,7 @@ struct J2DTevStageInfo {
/* 0x13 */ u8 field_0x13;
};
extern J2DTevStageInfo const j2dDefaultTevStageInfo;
DUSK_GAME_EXTERN J2DTevStageInfo const j2dDefaultTevStageInfo;
/**
* @ingroup jsystem-j2d
@@ -396,7 +396,7 @@ struct J2DTevSwapModeInfo {
/* 0x3 */ u8 field_0x3;
};
extern const J2DTevSwapModeInfo j2dDefaultTevSwapMode;
DUSK_GAME_EXTERN const J2DTevSwapModeInfo j2dDefaultTevSwapMode;
/**
* @ingroup jsystem-j2d
@@ -565,8 +565,8 @@ inline u8 J2DCalcTevSwapTable(u8 param_0, u8 param_1, u8 param_2, u8 param_3) {
return (param_0 << 6) + (param_1 << 4) + (param_2 << 2) + param_3;
}
extern const J2DTevSwapModeTableInfo j2dDefaultTevSwapModeTable;
extern const u8 j2dDefaultTevSwapTableID;
DUSK_GAME_EXTERN const J2DTevSwapModeTableInfo j2dDefaultTevSwapModeTable;
DUSK_GAME_EXTERN const u8 j2dDefaultTevSwapTableID;
/**
* @ingroup jsystem-j2d
@@ -615,7 +615,7 @@ struct J2DColorChanInfo {
};
inline u16 J2DCalcColorChanID(u8 param_0) { return param_0; }
extern const J2DColorChanInfo j2dDefaultColorChanInfo;
DUSK_GAME_EXTERN const J2DColorChanInfo j2dDefaultColorChanInfo;
/**
* @ingroup jsystem-j2d
@@ -644,12 +644,12 @@ private:
/* 0x0 */ u16 mColorChan;
};
extern const GXColor j2dDefaultColInfo;
extern const GXColorS10 j2dDefaultTevColor;
extern const GXColor j2dDefaultTevKColor;
extern const J2DTevOrderInfo j2dDefaultTevOrderInfoNull;
extern const u8 j2dDefaultPEBlockDither;
extern const u8 j2dDefaultTevSwapTableID;
extern const u16 j2dDefaultAlphaCmp;
DUSK_GAME_EXTERN const GXColor j2dDefaultColInfo;
DUSK_GAME_EXTERN const GXColorS10 j2dDefaultTevColor;
DUSK_GAME_EXTERN const GXColor j2dDefaultTevKColor;
DUSK_GAME_EXTERN const J2DTevOrderInfo j2dDefaultTevOrderInfoNull;
DUSK_GAME_EXTERN const u8 j2dDefaultPEBlockDither;
DUSK_GAME_EXTERN const u8 j2dDefaultTevSwapTableID;
DUSK_GAME_EXTERN const u16 j2dDefaultAlphaCmp;
#endif /* J2DTEVS_H */