kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove last comma from enums

Browse source
This commit is contained in:
dbalatoni13 2025-04-01 05:14:15 +02:00
parent 274f68087b
commit 43e3e7cca4
12 changed files with 98 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

26
include/PowerPC_EABI_Support/MetroTRK/trk.h
View file

@ -12,7 +12,7 @@ extern "C" {
typedef enum { typedef enum {
HARDWARE_AMC_DDH = 0, HARDWARE_AMC_DDH = 0,
HARDWARE_GDEV = 1, HARDWARE_GDEV = 1,
HARDWARE_BBA = 2, HARDWARE_BBA = 2
} HardwareType; } HardwareType;
// DS Error returns. // DS Error returns.
@ -37,7 +37,7 @@ enum {
DS_InvalidThreadID = 0x705, DS_InvalidThreadID = 0x705,
DS_OSError = 0x706, DS_OSError = 0x706,
DS_Error800 = 0x800, DS_Error800 = 0x800
}; };
typedef int DSError; typedef int DSError;
@ -46,14 +46,14 @@ typedef int DSError;
typedef enum { typedef enum {
DS_Stdin = 0, DS_Stdin = 0,
DS_Stdout = 1, DS_Stdout = 1,
DS_Stderr = 2, DS_Stderr = 2
} DSFileHandle; } DSFileHandle;
// IO returns. // IO returns.
typedef enum { typedef enum {
DS_IONoError = 0, DS_IONoError = 0,
DS_IOError = 1, DS_IOError = 1,
DS_IOEOF = 2, DS_IOEOF = 2
} DSIOResult; } DSIOResult;
// Message command IDs // Message command IDs
@ -86,7 +86,7 @@ typedef enum {
DSMSG_CloseFile = 0xD3, DSMSG_CloseFile = 0xD3,
DSMSG_PositionFile = 0xD4, DSMSG_PositionFile = 0xD4,
DSMSG_ReplyNAK = 0xFF, DSMSG_ReplyNAK = 0xFF
} MessageCommandID; } MessageCommandID;
// Register commands. // Register commands.
@ -94,7 +94,7 @@ typedef enum {
DSREG_Default = 0, DSREG_Default = 0,
DSREG_FP = 1, DSREG_FP = 1,
DSREG_Extended1 = 2, DSREG_Extended1 = 2,
DSREG_Extended2 = 3, DSREG_Extended2 = 3
} DSMessageRegisterOptions; } DSMessageRegisterOptions;
// Step commands. // Step commands.
@ -102,7 +102,7 @@ typedef enum {
DSSTEP_IntoCount = 0x0, DSSTEP_IntoCount = 0x0,
DSSTEP_IntoRange = 0x1, DSSTEP_IntoRange = 0x1,
DSSTEP_OverCount = 0x10, DSSTEP_OverCount = 0x10,
DSSTEP_OverRange = 0x11, DSSTEP_OverRange = 0x11
} DSMessageStepOptions; } DSMessageStepOptions;
typedef enum { typedef enum {
@ -128,14 +128,14 @@ typedef enum {
DSREPLY_OSError = 0x20, DSREPLY_OSError = 0x20,
DSREPLY_InvalidProcessID = 0x21, DSREPLY_InvalidProcessID = 0x21,
DSREPLY_InvalidThreadID = 0x22, DSREPLY_InvalidThreadID = 0x22,
DSREPLY_DebugSecurityError = 0x23, DSREPLY_DebugSecurityError = 0x23
} DSReplyError; } DSReplyError;
typedef enum { typedef enum {
DSRECV_Wait = 0, DSRECV_Wait = 0,
DSRECV_Found = 1, DSRECV_Found = 1,
DSRECV_InFrame = 2, DSRECV_InFrame = 2,
DSRECV_FrameOverflow = 3, DSRECV_FrameOverflow = 3
} ReceiverState; } ReceiverState;
typedef enum { typedef enum {
@ -154,17 +154,17 @@ typedef enum {
NUBEVENT_Request = 2, NUBEVENT_Request = 2,
NUBEVENT_Breakpoint = 3, NUBEVENT_Breakpoint = 3,
NUBEVENT_Exception = 4, NUBEVENT_Exception = 4,
NUBEVENT_Support = 5, NUBEVENT_Support = 5
} NubEventType; } NubEventType;
typedef enum { typedef enum {
VALIDMEM_Readable = 0, VALIDMEM_Readable = 0,
VALIDMEM_Writeable = 1, VALIDMEM_Writeable = 1
} ValidMemoryOptions; } ValidMemoryOptions;
typedef enum { typedef enum {
MEMACCESS_UserMemory = 0, MEMACCESS_UserMemory = 0,
MEMACCESS_DebuggerMemory = 1, MEMACCESS_DebuggerMemory = 1
} MemoryAccessOptions; } MemoryAccessOptions;
typedef int UARTError; typedef int UARTError;
@ -174,7 +174,7 @@ typedef enum {
UART_UnknownBaudRate = 1, UART_UnknownBaudRate = 1,
UART_ConfigurationError = 2, UART_ConfigurationError = 2,
UART_BufferOverflow = 3, // specified buffer was too small UART_BufferOverflow = 3, // specified buffer was too small
UART_NoData = 4, // no data available from polling UART_NoData = 4 // no data available from polling
} UARTErrorOptions; } UARTErrorOptions;
typedef enum { typedef enum {

10
include/PowerPC_EABI_Support/Msl/MSL_C/MSL_Common/ansi_files.h
View file

@ -28,13 +28,13 @@ enum __file_kinds {
__disk_file, __disk_file,
__console_file, __console_file,
__string_file, __string_file,
__unavailable_file, __unavailable_file
}; };
enum __file_orientation { enum __file_orientation {
/* 0x0 */ UNORIENTED, /* 0x0 */ UNORIENTED,
/* 0x1 */ CHAR_ORIENTED, /* 0x1 */ CHAR_ORIENTED,
/* 0x2 */ WIDE_ORIENTED, /* 0x2 */ WIDE_ORIENTED
}; };
typedef struct _file_modes { typedef struct _file_modes {
@ -50,20 +50,20 @@ enum __io_modes {
__read = 1, __read = 1,
__write = 2, __write = 2,
__read_write = 3, __read_write = 3,
__append = 4, __append = 4
}; };
enum __io_states { enum __io_states {
__neutral, __neutral,
__writing, __writing,
__reading, __reading,
__rereading, __rereading
}; };
enum __io_results { enum __io_results {
__no_io_error, __no_io_error,
__io_error, __io_error,
__io_EOF, __io_EOF
}; };
typedef struct _file_states { typedef struct _file_states {

2
include/REL/w10Dll.h
View file

@ -9,7 +9,7 @@
enum { enum {
MAPOBJ_MELON = 0, MAPOBJ_MELON = 0,
MAPOBJ_MAX, MAPOBJ_MAX
}; };
typedef struct w10_board_work { typedef struct w10_board_work {

6
include/data_num/title.h
View file

@ -20,7 +20,7 @@ enum {
TITLE_COPYRIGHT_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 10), TITLE_COPYRIGHT_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 10),
TITLE_CHAR_HSF = DATA_MAKE_NUM(DATADIR_TITLE, 11), TITLE_CHAR_HSF = DATA_MAKE_NUM(DATADIR_TITLE, 11),
TITLE_CUBE_HSF = DATA_MAKE_NUM(DATADIR_TITLE, 12), TITLE_CUBE_HSF = DATA_MAKE_NUM(DATADIR_TITLE, 12),
TITLE_SKY_HSF = DATA_MAKE_NUM(DATADIR_TITLE, 13), TITLE_SKY_HSF = DATA_MAKE_NUM(DATADIR_TITLE, 13)
}; };
#else #else
@ -54,9 +54,9 @@ enum {
TITLE_LANGUAGE_GE_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 25), TITLE_LANGUAGE_GE_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 25),
TITLE_LANGUAGE_FR_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 26), TITLE_LANGUAGE_FR_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 26),
TITLE_LANGUAGE_IT_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 27), TITLE_LANGUAGE_IT_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 27),
TITLE_LANGUAGE_ES_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 28), TITLE_LANGUAGE_ES_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 28)
}; };
#endif #endif
#endif #endif

4
include/data_num/win.h
View file

@ -36,7 +36,7 @@ enum {
WIN_CARD_BOX2_ICON_ANM = DATA_MAKE_NUM(DATADIR_WIN, 29), WIN_CARD_BOX2_ICON_ANM = DATA_MAKE_NUM(DATADIR_WIN, 29),
WIN_CARD_BOX3_ICON_ANM = DATA_MAKE_NUM(DATADIR_WIN, 30), WIN_CARD_BOX3_ICON_ANM = DATA_MAKE_NUM(DATADIR_WIN, 30),
WIN_CARD_BANNER_ANM = DATA_MAKE_NUM(DATADIR_WIN, 31), WIN_CARD_BANNER_ANM = DATA_MAKE_NUM(DATADIR_WIN, 31),
WIN_SAVE_BG_ANM = DATA_MAKE_NUM(DATADIR_WIN, 32), WIN_SAVE_BG_ANM = DATA_MAKE_NUM(DATADIR_WIN, 32)
}; };
#endif #endif

2
include/dolphin/demo/DEMOPuts.h
View file

@ -5,7 +5,7 @@
typedef enum { typedef enum {
DMTF_POINTSAMPLE, DMTF_POINTSAMPLE,
DMTF_BILERP, DMTF_BILERP
} DMTexFlt; } DMTexFlt;
typedef enum { DM_FT_OPQ, DM_FT_RVS, DM_FT_XLU } DMFontType; typedef enum { DM_FT_OPQ, DM_FT_RVS, DM_FT_XLU } DMFontType;

4
include/dolphin/demo/DEMOStats.h
View file

@ -11,7 +11,7 @@ typedef enum DEMO_STAT_TYPE {
DEMO_STAT_TBW = 6, DEMO_STAT_TBW = 6,
DEMO_STAT_TBP = 7, DEMO_STAT_TBP = 7,
DEMO_STAT_MYC = 8, DEMO_STAT_MYC = 8,
DEMO_STAT_MYR = 9, DEMO_STAT_MYR = 9
} DEMO_STAT_TYPE; } DEMO_STAT_TYPE;
typedef struct DemoStatData { typedef struct DemoStatData {
@ -26,7 +26,7 @@ typedef enum {
DEMO_STAT_BL = 1, DEMO_STAT_BL = 1,
DEMO_STAT_TLD = 2, DEMO_STAT_TLD = 2,
DEMO_STAT_BLD = 3, DEMO_STAT_BLD = 3,
DEMO_STAT_IO = 4, DEMO_STAT_IO = 4
} DEMO_STAT_DISP; } DEMO_STAT_DISP;
extern unsigned char DemoStatEnable; extern unsigned char DemoStatEnable;

135
include/dolphin/gx/GXEnum.h
View file

@ -23,7 +23,7 @@ typedef u8 GXBool;
typedef enum _GXProjectionType { typedef enum _GXProjectionType {
GX_PERSPECTIVE, GX_PERSPECTIVE,
GX_ORTHOGRAPHIC, GX_ORTHOGRAPHIC
} GXProjectionType; } GXProjectionType;
typedef enum _GXCompare { typedef enum _GXCompare {
@ -34,7 +34,7 @@ typedef enum _GXCompare {
GX_GREATER, GX_GREATER,
GX_NEQUAL, GX_NEQUAL,
GX_GEQUAL, GX_GEQUAL,
GX_ALWAYS, GX_ALWAYS
} GXCompare; } GXCompare;
typedef enum _GXAlphaOp { typedef enum _GXAlphaOp {
@ -42,20 +42,20 @@ typedef enum _GXAlphaOp {
GX_AOP_OR, GX_AOP_OR,
GX_AOP_XOR, GX_AOP_XOR,
GX_AOP_XNOR, GX_AOP_XNOR,
GX_MAX_ALPHAOP, GX_MAX_ALPHAOP
} GXAlphaOp; } GXAlphaOp;
typedef enum _GXZFmt16 { typedef enum _GXZFmt16 {
GX_ZC_LINEAR, GX_ZC_LINEAR,
GX_ZC_NEAR, GX_ZC_NEAR,
GX_ZC_MID, GX_ZC_MID,
GX_ZC_FAR, GX_ZC_FAR
} GXZFmt16; } GXZFmt16;
typedef enum _GXGamma { typedef enum _GXGamma {
GX_GM_1_0, GX_GM_1_0,
GX_GM_1_7, GX_GM_1_7,
GX_GM_2_2, GX_GM_2_2
} GXGamma; } GXGamma;
typedef enum _GXPixelFmt { typedef enum _GXPixelFmt {
@ -66,7 +66,7 @@ typedef enum _GXPixelFmt {
GX_PF_Y8, GX_PF_Y8,
GX_PF_U8, GX_PF_U8,
GX_PF_V8, GX_PF_V8,
GX_PF_YUV420, GX_PF_YUV420
} GXPixelFmt; } GXPixelFmt;
typedef enum _GXPrimitive { typedef enum _GXPrimitive {
@ -76,7 +76,7 @@ typedef enum _GXPrimitive {
GX_TRIANGLEFAN = 0xA0, GX_TRIANGLEFAN = 0xA0,
GX_LINES = 0xA8, GX_LINES = 0xA8,
GX_LINESTRIP = 0xB0, GX_LINESTRIP = 0xB0,
GX_POINTS = 0xB8, GX_POINTS = 0xB8
} GXPrimitive; } GXPrimitive;
typedef enum _GXVtxFmt { typedef enum _GXVtxFmt {
@ -88,7 +88,7 @@ typedef enum _GXVtxFmt {
GX_VTXFMT5, GX_VTXFMT5,
GX_VTXFMT6, GX_VTXFMT6,
GX_VTXFMT7, GX_VTXFMT7,
GX_MAX_VTXFMT, GX_MAX_VTXFMT
} GXVtxFmt; } GXVtxFmt;
typedef enum _GXAttr { typedef enum _GXAttr {
@ -119,7 +119,7 @@ typedef enum _GXAttr {
GX_LIGHT_ARRAY, GX_LIGHT_ARRAY,
GX_VA_NBT, GX_VA_NBT,
GX_VA_MAX_ATTR, GX_VA_MAX_ATTR,
GX_VA_NULL = 0xFF, GX_VA_NULL = 0xFF
} GXAttr; } GXAttr;
#define GX_MAX_VTXDESCLIST_SZ (GX_VA_MAX_ATTR + 1) #define GX_MAX_VTXDESCLIST_SZ (GX_VA_MAX_ATTR + 1)
@ -128,7 +128,7 @@ typedef enum _GXAttrType {
GX_NONE, GX_NONE,
GX_DIRECT, GX_DIRECT,
GX_INDEX8, GX_INDEX8,
GX_INDEX16, GX_INDEX16
} GXAttrType; } GXAttrType;
#define _GX_TF_CTF 0x20 #define _GX_TF_CTF 0x20
@ -164,20 +164,20 @@ typedef enum _GXTexFmt {
GX_CTF_Z8L = 0xA | _GX_TF_ZTF | _GX_TF_CTF, GX_CTF_Z8L = 0xA | _GX_TF_ZTF | _GX_TF_CTF,
GX_CTF_Z16L = 0xC | _GX_TF_ZTF | _GX_TF_CTF, GX_CTF_Z16L = 0xC | _GX_TF_ZTF | _GX_TF_CTF,
GX_TF_A8 = GX_CTF_A8, GX_TF_A8 = GX_CTF_A8
} GXTexFmt; } GXTexFmt;
typedef enum _GXCITexFmt { typedef enum _GXCITexFmt {
GX_TF_C4 = 0x8, GX_TF_C4 = 0x8,
GX_TF_C8 = 0x9, GX_TF_C8 = 0x9,
GX_TF_C14X2 = 0xa, GX_TF_C14X2 = 0xa
} GXCITexFmt; } GXCITexFmt;
typedef enum _GXTexWrapMode { typedef enum _GXTexWrapMode {
GX_CLAMP, GX_CLAMP,
GX_REPEAT, GX_REPEAT,
GX_MIRROR, GX_MIRROR,
GX_MAX_TEXWRAPMODE, GX_MAX_TEXWRAPMODE
} GXTexWrapMode; } GXTexWrapMode;
typedef enum _GXTexFilter { typedef enum _GXTexFilter {
@ -186,14 +186,14 @@ typedef enum _GXTexFilter {
GX_NEAR_MIP_NEAR, GX_NEAR_MIP_NEAR,
GX_LIN_MIP_NEAR, GX_LIN_MIP_NEAR,
GX_NEAR_MIP_LIN, GX_NEAR_MIP_LIN,
GX_LIN_MIP_LIN, GX_LIN_MIP_LIN
} GXTexFilter; } GXTexFilter;
typedef enum _GXAnisotropy { typedef enum _GXAnisotropy {
GX_ANISO_1, GX_ANISO_1,
GX_ANISO_2, GX_ANISO_2,
GX_ANISO_4, GX_ANISO_4,
GX_MAX_ANISOTROPY, GX_MAX_ANISOTROPY
} GXAnisotropy; } GXAnisotropy;
typedef enum _GXTexMapID { typedef enum _GXTexMapID {
@ -207,7 +207,7 @@ typedef enum _GXTexMapID {
GX_TEXMAP7, GX_TEXMAP7,
GX_MAX_TEXMAP, GX_MAX_TEXMAP,
GX_TEXMAP_NULL = 0xFF, GX_TEXMAP_NULL = 0xFF,
GX_TEX_DISABLE = 0x100, GX_TEX_DISABLE = 0x100
} GXTexMapID; } GXTexMapID;
typedef enum _GXTexCoordID { typedef enum _GXTexCoordID {
@ -220,7 +220,7 @@ typedef enum _GXTexCoordID {
GX_TEXCOORD6, GX_TEXCOORD6,
GX_TEXCOORD7, GX_TEXCOORD7,
GX_MAX_TEXCOORD, GX_MAX_TEXCOORD,
GX_TEXCOORD_NULL = 0xFF, GX_TEXCOORD_NULL = 0xFF
} GXTexCoordID; } GXTexCoordID;
typedef enum _GXTevStageID { typedef enum _GXTevStageID {
@ -240,7 +240,7 @@ typedef enum _GXTevStageID {
GX_TEVSTAGE13, GX_TEVSTAGE13,
GX_TEVSTAGE14, GX_TEVSTAGE14,
GX_TEVSTAGE15, GX_TEVSTAGE15,
GX_MAX_TEVSTAGE, GX_MAX_TEVSTAGE
} GXTevStageID; } GXTevStageID;
typedef enum _GXTevMode { typedef enum _GXTevMode {
@ -248,12 +248,12 @@ typedef enum _GXTevMode {
GX_DECAL, GX_DECAL,
GX_BLEND, GX_BLEND,
GX_REPLACE, GX_REPLACE,
GX_PASSCLR, GX_PASSCLR
} GXTevMode; } GXTevMode;
typedef enum _GXTexMtxType { typedef enum _GXTexMtxType {
GX_MTX3x4, GX_MTX3x4,
GX_MTX2x4, GX_MTX2x4
} GXTexMtxType; } GXTexMtxType;
typedef enum _GXTexGenType { typedef enum _GXTexGenType {
@ -267,7 +267,7 @@ typedef enum _GXTexGenType {
GX_TG_BUMP5, GX_TG_BUMP5,
GX_TG_BUMP6, GX_TG_BUMP6,
GX_TG_BUMP7, GX_TG_BUMP7,
GX_TG_SRTG, GX_TG_SRTG
} GXTexGenType; } GXTexGenType;
typedef enum _GXPosNrmMtx { typedef enum _GXPosNrmMtx {
@ -280,7 +280,7 @@ typedef enum _GXPosNrmMtx {
GX_PNMTX6 = 18, GX_PNMTX6 = 18,
GX_PNMTX7 = 21, GX_PNMTX7 = 21,
GX_PNMTX8 = 24, GX_PNMTX8 = 24,
GX_PNMTX9 = 27, GX_PNMTX9 = 27
} GXPosNrmMtx; } GXPosNrmMtx;
typedef enum _GXTexMtx { typedef enum _GXTexMtx {
@ -294,7 +294,7 @@ typedef enum _GXTexMtx {
GX_TEXMTX7 = 51, GX_TEXMTX7 = 51,
GX_TEXMTX8 = 54, GX_TEXMTX8 = 54,
GX_TEXMTX9 = 57, GX_TEXMTX9 = 57,
GX_IDENTITY = 60, GX_IDENTITY = 60
} GXTexMtx; } GXTexMtx;
typedef enum _GXChannelID { typedef enum _GXChannelID {
@ -307,7 +307,7 @@ typedef enum _GXChannelID {
GX_COLOR_ZERO, GX_COLOR_ZERO,
GX_ALPHA_BUMP, GX_ALPHA_BUMP,
GX_ALPHA_BUMPN, GX_ALPHA_BUMPN,
GX_COLOR_NULL = 0xFF, GX_COLOR_NULL = 0xFF
} GXChannelID; } GXChannelID;
typedef enum _GXTexGenSrc { typedef enum _GXTexGenSrc {
@ -332,7 +332,7 @@ typedef enum _GXTexGenSrc {
GX_TG_TEXCOORD6, GX_TG_TEXCOORD6,
GX_TG_COLOR0, GX_TG_COLOR0,
GX_TG_COLOR1, GX_TG_COLOR1,
GX_MAX_TEXGENSRC, GX_MAX_TEXGENSRC
} GXTexGenSrc; } GXTexGenSrc;
typedef enum _GXBlendMode { typedef enum _GXBlendMode {
@ -340,7 +340,7 @@ typedef enum _GXBlendMode {
GX_BM_BLEND, GX_BM_BLEND,
GX_BM_LOGIC, GX_BM_LOGIC,
GX_BM_SUBTRACT, GX_BM_SUBTRACT,
GX_MAX_BLENDMODE, GX_MAX_BLENDMODE
} GXBlendMode; } GXBlendMode;
typedef enum _GXBlendFactor { typedef enum _GXBlendFactor {
@ -353,7 +353,7 @@ typedef enum _GXBlendFactor {
GX_BL_DSTALPHA, GX_BL_DSTALPHA,
GX_BL_INVDSTALPHA, GX_BL_INVDSTALPHA,
GX_BL_DSTCLR = GX_BL_SRCCLR, GX_BL_DSTCLR = GX_BL_SRCCLR,
GX_BL_INVDSTCLR = GX_BL_INVSRCCLR, GX_BL_INVDSTCLR = GX_BL_INVSRCCLR
} GXBlendFactor; } GXBlendFactor;
typedef enum _GXLogicOp { typedef enum _GXLogicOp {
@ -372,7 +372,7 @@ typedef enum _GXLogicOp {
GX_LO_INVCOPY, GX_LO_INVCOPY,
GX_LO_INVOR, GX_LO_INVOR,
GX_LO_NAND, GX_LO_NAND,
GX_LO_SET, GX_LO_SET
} GXLogicOp; } GXLogicOp;
typedef enum _GXCompCnt { typedef enum _GXCompCnt {
@ -384,7 +384,7 @@ typedef enum _GXCompCnt {
GX_CLR_RGB = 0, GX_CLR_RGB = 0,
GX_CLR_RGBA = 1, GX_CLR_RGBA = 1,
GX_TEX_S = 0, GX_TEX_S = 0,
GX_TEX_ST = 1, GX_TEX_ST = 1
} GXCompCnt; } GXCompCnt;
typedef enum _GXCompType { typedef enum _GXCompType {
@ -398,7 +398,7 @@ typedef enum _GXCompType {
GX_RGBX8 = 2, GX_RGBX8 = 2,
GX_RGBA4 = 3, GX_RGBA4 = 3,
GX_RGBA6 = 4, GX_RGBA6 = 4,
GX_RGBA8 = 5, GX_RGBA8 = 5
} GXCompType; } GXCompType;
typedef enum _GXPTTexMtx { typedef enum _GXPTTexMtx {
@ -422,7 +422,7 @@ typedef enum _GXPTTexMtx {
GX_PTTEXMTX17 = 115, GX_PTTEXMTX17 = 115,
GX_PTTEXMTX18 = 118, GX_PTTEXMTX18 = 118,
GX_PTTEXMTX19 = 121, GX_PTTEXMTX19 = 121,
GX_PTIDENTITY = 125, GX_PTIDENTITY = 125
} GXPTTexMtx; } GXPTTexMtx;
typedef enum _GXTevRegID { typedef enum _GXTevRegID {
@ -430,24 +430,24 @@ typedef enum _GXTevRegID {
GX_TEVREG0, GX_TEVREG0,
GX_TEVREG1, GX_TEVREG1,
GX_TEVREG2, GX_TEVREG2,
GX_MAX_TEVREG, GX_MAX_TEVREG
} GXTevRegID; } GXTevRegID;
typedef enum _GXDiffuseFn { typedef enum _GXDiffuseFn {
GX_DF_NONE, GX_DF_NONE,
GX_DF_SIGN, GX_DF_SIGN,
GX_DF_CLAMP, GX_DF_CLAMP
} GXDiffuseFn; } GXDiffuseFn;
typedef enum _GXColorSrc { typedef enum _GXColorSrc {
GX_SRC_REG, GX_SRC_REG,
GX_SRC_VTX, GX_SRC_VTX
} GXColorSrc; } GXColorSrc;
typedef enum _GXAttnFn { typedef enum _GXAttnFn {
GX_AF_SPEC, GX_AF_SPEC,
GX_AF_SPOT, GX_AF_SPOT,
GX_AF_NONE, GX_AF_NONE
} GXAttnFn; } GXAttnFn;
typedef enum _GXLightID { typedef enum _GXLightID {
@ -460,7 +460,7 @@ typedef enum _GXLightID {
GX_LIGHT6 = 0x040, GX_LIGHT6 = 0x040,
GX_LIGHT7 = 0x080, GX_LIGHT7 = 0x080,
GX_MAX_LIGHT = 0x100, GX_MAX_LIGHT = 0x100,
GX_LIGHT_NULL = 0, GX_LIGHT_NULL = 0
} GXLightID; } GXLightID;
typedef enum _GXTexOffset { typedef enum _GXTexOffset {
@ -470,7 +470,7 @@ typedef enum _GXTexOffset {
GX_TO_FOURTH, GX_TO_FOURTH,
GX_TO_HALF, GX_TO_HALF,
GX_TO_ONE, GX_TO_ONE,
GX_MAX_TEXOFFSET, GX_MAX_TEXOFFSET
} GXTexOffset; } GXTexOffset;
typedef enum _GXSpotFn { typedef enum _GXSpotFn {
@ -480,21 +480,21 @@ typedef enum _GXSpotFn {
GX_SP_COS2, GX_SP_COS2,
GX_SP_SHARP, GX_SP_SHARP,
GX_SP_RING1, GX_SP_RING1,
GX_SP_RING2, GX_SP_RING2
} GXSpotFn; } GXSpotFn;
typedef enum _GXDistAttnFn { typedef enum _GXDistAttnFn {
GX_DA_OFF, GX_DA_OFF,
GX_DA_GENTLE, GX_DA_GENTLE,
GX_DA_MEDIUM, GX_DA_MEDIUM,
GX_DA_STEEP, GX_DA_STEEP
} GXDistAttnFn; } GXDistAttnFn;
typedef enum _GXCullMode { typedef enum _GXCullMode {
GX_CULL_NONE, GX_CULL_NONE,
GX_CULL_FRONT, GX_CULL_FRONT,
GX_CULL_BACK, GX_CULL_BACK,
GX_CULL_ALL, GX_CULL_ALL
} GXCullMode; } GXCullMode;
typedef enum _GXTevSwapSel { typedef enum _GXTevSwapSel {
@ -502,14 +502,14 @@ typedef enum _GXTevSwapSel {
GX_TEV_SWAP1, GX_TEV_SWAP1,
GX_TEV_SWAP2, GX_TEV_SWAP2,
GX_TEV_SWAP3, GX_TEV_SWAP3,
GX_MAX_TEVSWAP, GX_MAX_TEVSWAP
} GXTevSwapSel; } GXTevSwapSel;
typedef enum _GXTevColorChan { typedef enum _GXTevColorChan {
GX_CH_RED = 0, GX_CH_RED = 0,
GX_CH_GREEN, GX_CH_GREEN,
GX_CH_BLUE, GX_CH_BLUE,
GX_CH_ALPHA, GX_CH_ALPHA
} GXTevColorChan; } GXTevColorChan;
typedef enum _GXFogType { typedef enum _GXFogType {
@ -528,7 +528,7 @@ typedef enum _GXFogType {
GX_FOG_EXP = GX_FOG_PERSP_EXP, GX_FOG_EXP = GX_FOG_PERSP_EXP,
GX_FOG_EXP2 = GX_FOG_PERSP_EXP2, GX_FOG_EXP2 = GX_FOG_PERSP_EXP2,
GX_FOG_REVEXP = GX_FOG_PERSP_REVEXP, GX_FOG_REVEXP = GX_FOG_PERSP_REVEXP,
GX_FOG_REVEXP2 = GX_FOG_PERSP_REVEXP2, GX_FOG_REVEXP2 = GX_FOG_PERSP_REVEXP2
} GXFogType; } GXFogType;
typedef enum _GXTevColorArg { typedef enum _GXTevColorArg {
@ -547,7 +547,7 @@ typedef enum _GXTevColorArg {
GX_CC_ONE, GX_CC_ONE,
GX_CC_HALF, GX_CC_HALF,
GX_CC_KONST, GX_CC_KONST,
GX_CC_ZERO, GX_CC_ZERO
} GXTevColorArg; } GXTevColorArg;
typedef enum _GXTevAlphaArg { typedef enum _GXTevAlphaArg {
@ -558,7 +558,7 @@ typedef enum _GXTevAlphaArg {
GX_CA_TEXA, GX_CA_TEXA,
GX_CA_RASA, GX_CA_RASA,
GX_CA_KONST, GX_CA_KONST,
GX_CA_ZERO, GX_CA_ZERO
} GXTevAlphaArg; } GXTevAlphaArg;
typedef enum _GXTevOp { typedef enum _GXTevOp {
@ -573,14 +573,14 @@ typedef enum _GXTevOp {
GX_TEV_COMP_RGB8_GT = 14, GX_TEV_COMP_RGB8_GT = 14,
GX_TEV_COMP_RGB8_EQ = 15, GX_TEV_COMP_RGB8_EQ = 15,
GX_TEV_COMP_A8_GT = GX_TEV_COMP_RGB8_GT, GX_TEV_COMP_A8_GT = GX_TEV_COMP_RGB8_GT,
GX_TEV_COMP_A8_EQ = GX_TEV_COMP_RGB8_EQ, GX_TEV_COMP_A8_EQ = GX_TEV_COMP_RGB8_EQ
} GXTevOp; } GXTevOp;
typedef enum _GXTevBias { typedef enum _GXTevBias {
GX_TB_ZERO, GX_TB_ZERO,
GX_TB_ADDHALF, GX_TB_ADDHALF,
GX_TB_SUBHALF, GX_TB_SUBHALF,
GX_MAX_TEVBIAS, GX_MAX_TEVBIAS
} GXTevBias; } GXTevBias;
typedef enum _GXTevScale { typedef enum _GXTevScale {
@ -588,7 +588,7 @@ typedef enum _GXTevScale {
GX_CS_SCALE_2, GX_CS_SCALE_2,
GX_CS_SCALE_4, GX_CS_SCALE_4,
GX_CS_DIVIDE_2, GX_CS_DIVIDE_2,
GX_MAX_TEVSCALE, GX_MAX_TEVSCALE
} GXTevScale; } GXTevScale;
typedef enum _GXTevKColorSel { typedef enum _GXTevKColorSel {
@ -623,7 +623,7 @@ typedef enum _GXTevKColorSel {
GX_TEV_KCSEL_K0_A = 0x1C, GX_TEV_KCSEL_K0_A = 0x1C,
GX_TEV_KCSEL_K1_A = 0x1D, GX_TEV_KCSEL_K1_A = 0x1D,
GX_TEV_KCSEL_K2_A = 0x1E, GX_TEV_KCSEL_K2_A = 0x1E,
GX_TEV_KCSEL_K3_A = 0x1F, GX_TEV_KCSEL_K3_A = 0x1F
} GXTevKColorSel; } GXTevKColorSel;
typedef enum _GXTevKAlphaSel { typedef enum _GXTevKAlphaSel {
@ -654,7 +654,7 @@ typedef enum _GXTevKAlphaSel {
GX_TEV_KASEL_K0_A = 0x1C, GX_TEV_KASEL_K0_A = 0x1C,
GX_TEV_KASEL_K1_A = 0x1D, GX_TEV_KASEL_K1_A = 0x1D,
GX_TEV_KASEL_K2_A = 0x1E, GX_TEV_KASEL_K2_A = 0x1E,
GX_TEV_KASEL_K3_A = 0x1F, GX_TEV_KASEL_K3_A = 0x1F
} GXTevKAlphaSel; } GXTevKAlphaSel;
typedef enum _GXTevKColorID { typedef enum _GXTevKColorID {
@ -662,14 +662,14 @@ typedef enum _GXTevKColorID {
GX_KCOLOR1, GX_KCOLOR1,
GX_KCOLOR2, GX_KCOLOR2,
GX_KCOLOR3, GX_KCOLOR3,
GX_MAX_KCOLOR, GX_MAX_KCOLOR
} GXTevKColorID; } GXTevKColorID;
typedef enum _GXZTexOp { typedef enum _GXZTexOp {
GX_ZT_DISABLE, GX_ZT_DISABLE,
GX_ZT_ADD, GX_ZT_ADD,
GX_ZT_REPLACE, GX_ZT_REPLACE,
GX_MAX_ZTEXOP, GX_MAX_ZTEXO
} GXZTexOp; } GXZTexOp;
typedef enum _GXIndTexFormat { typedef enum _GXIndTexFormat {
@ -677,7 +677,7 @@ typedef enum _GXIndTexFormat {
GX_ITF_5, GX_ITF_5,
GX_ITF_4, GX_ITF_4,
GX_ITF_3, GX_ITF_3,
GX_MAX_ITFORMAT, GX_MAX_ITFORMAT
} GXIndTexFormat; } GXIndTexFormat;
typedef enum _GXIndTexBiasSel { typedef enum _GXIndTexBiasSel {
@ -689,7 +689,7 @@ typedef enum _GXIndTexBiasSel {
GX_ITB_SU, GX_ITB_SU,
GX_ITB_TU, GX_ITB_TU,
GX_ITB_STU, GX_ITB_STU,
GX_MAX_ITBIAS, GX_MAX_ITBIAS
} GXIndTexBiasSel; } GXIndTexBiasSel;
typedef enum _GXIndTexAlphaSel { typedef enum _GXIndTexAlphaSel {
@ -697,7 +697,7 @@ typedef enum _GXIndTexAlphaSel {
GX_ITBA_S, GX_ITBA_S,
GX_ITBA_T, GX_ITBA_T,
GX_ITBA_U, GX_ITBA_U,
GX_MAX_ITBALPHA, GX_MAX_ITBALPHA
} GXIndTexAlphaSel; } GXIndTexAlphaSel;
typedef enum _GXIndTexMtxID { typedef enum _GXIndTexMtxID {
@ -710,7 +710,7 @@ typedef enum _GXIndTexMtxID {
GX_ITM_S2, GX_ITM_S2,
GX_ITM_T0 = 9, GX_ITM_T0 = 9,
GX_ITM_T1, GX_ITM_T1,
GX_ITM_T2, GX_ITM_T2
} GXIndTexMtxID; } GXIndTexMtxID;
typedef enum _GXIndTexWrap { typedef enum _GXIndTexWrap {
@ -721,7 +721,7 @@ typedef enum _GXIndTexWrap {
GX_ITW_32, GX_ITW_32,
GX_ITW_16, GX_ITW_16,
GX_ITW_0, GX_ITW_0,
GX_MAX_ITWRAP, GX_MAX_ITWRAP
} GXIndTexWrap; } GXIndTexWrap;
typedef enum _GXIndTexStageID { typedef enum _GXIndTexStageID {
@ -729,7 +729,7 @@ typedef enum _GXIndTexStageID {
GX_INDTEXSTAGE1, GX_INDTEXSTAGE1,
GX_INDTEXSTAGE2, GX_INDTEXSTAGE2,
GX_INDTEXSTAGE3, GX_INDTEXSTAGE3,
GX_MAX_INDTEXSTAGE, GX_MAX_INDTEXSTAGE
} GXIndTexStageID; } GXIndTexStageID;
typedef enum _GXIndTexScale { typedef enum _GXIndTexScale {
@ -742,12 +742,12 @@ typedef enum _GXIndTexScale {
GX_ITS_64, GX_ITS_64,
GX_ITS_128, GX_ITS_128,
GX_ITS_256, GX_ITS_256,
GX_MAX_ITSCALE, GX_MAX_ITSCALE
} GXIndTexScale; } GXIndTexScale;
typedef enum _GXClipMode { typedef enum _GXClipMode {
GX_CLIP_ENABLE = 0, GX_CLIP_ENABLE = 0,
GX_CLIP_DISABLE = 1, GX_CLIP_DISABLE = 1
} GXClipMode; } GXClipMode;
typedef enum _GXTlut { typedef enum _GXTlut {
@ -770,21 +770,21 @@ typedef enum _GXTlut {
GX_BIGTLUT0 = 16, GX_BIGTLUT0 = 16,
GX_BIGTLUT1 = 17, GX_BIGTLUT1 = 17,
GX_BIGTLUT2 = 18, GX_BIGTLUT2 = 18,
GX_BIGTLUT3 = 19, GX_BIGTLUT3 = 19
} GXTlut; } GXTlut;
typedef enum _GXTlutFmt { typedef enum _GXTlutFmt {
GX_TL_IA8, GX_TL_IA8,
GX_TL_RGB565, GX_TL_RGB565,
GX_TL_RGB5A3, GX_TL_RGB5A3,
GX_MAX_TLUTFMT, GX_MAX_TLUTFMT
} GXTlutFmt; } GXTlutFmt;
typedef enum _GXMiscToken { typedef enum _GXMiscToken {
GX_MT_NULL = 0, GX_MT_NULL = 0,
GX_MT_XF_FLUSH = 1, GX_MT_XF_FLUSH = 1,
GX_MT_DL_SAVE_CONTEXT = 2, GX_MT_DL_SAVE_CONTEXT = 2,
GX_MT_ABORT_WAIT_COPYOUT = 3, GX_MT_ABORT_WAIT_COPYOUT = 3
} GXMiscToken; } GXMiscToken;
typedef enum _GXTexCacheSize { typedef enum _GXTexCacheSize {
@ -834,7 +834,6 @@ typedef enum _GXPerf0 {
GX_PERF0_CLOCKS, GX_PERF0_CLOCKS,
GX_PERF0_NONE GX_PERF0_NONE
} GXPerf0; } GXPerf0;
typedef enum _GXPerf1 { typedef enum _GXPerf1 {
@ -864,7 +863,6 @@ typedef enum _GXPerf1 {
GX_PERF1_CLOCKS, GX_PERF1_CLOCKS,
GX_PERF1_NONE GX_PERF1_NONE
} GXPerf1; } GXPerf1;
typedef enum _GXVCachePerf { typedef enum _GXVCachePerf {
@ -881,25 +879,24 @@ typedef enum _GXVCachePerf {
GX_VC_TEX6, GX_VC_TEX6,
GX_VC_TEX7, GX_VC_TEX7,
GX_VC_ALL = 0xf GX_VC_ALL = 0xf
} GXVCachePerf; } GXVCachePerf;
typedef enum _GXFBClamp { typedef enum _GXFBClamp {
GX_CLAMP_NONE = 0, GX_CLAMP_NONE = 0,
GX_CLAMP_TOP = 1, GX_CLAMP_TOP = 1,
GX_CLAMP_BOTTOM = 2, GX_CLAMP_BOTTOM = 2
} GXFBClamp; } GXFBClamp;
typedef enum _GXCopyMode { typedef enum _GXCopyMode {
GX_COPY_PROGRESSIVE = 0, GX_COPY_PROGRESSIVE = 0,
GX_COPY_INTLC_EVEN = 2, GX_COPY_INTLC_EVEN = 2,
GX_COPY_INTLC_ODD = 3, GX_COPY_INTLC_ODD = 3
} GXCopyMode; } GXCopyMode;
typedef enum _GXAlphaReadMode { typedef enum _GXAlphaReadMode {
GX_READ_00 = 0, GX_READ_00 = 0,
GX_READ_FF = 1, GX_READ_FF = 1,
GX_READ_NONE = 2, GX_READ_NONE = 2
} GXAlphaReadMode; } GXAlphaReadMode;

2
include/dolphin/gx/GXExtra.h
View file

@ -19,7 +19,7 @@ typedef struct {
typedef enum { typedef enum {
GX_TF_R8_PC = 0x60, GX_TF_R8_PC = 0x60,
GX_TF_RGBA8_PC = 0x61, GX_TF_RGBA8_PC = 0x61
} GXPCTexFmt; } GXPCTexFmt;
void GXDestroyTexObj(GXTexObj* obj); void GXDestroyTexObj(GXTexObj* obj);

2
include/dolphin/gx/GXStruct.h
View file

@ -89,7 +89,7 @@ typedef enum _GXTlutSize
GX_TLUT_2K = 128, GX_TLUT_2K = 128,
GX_TLUT_4K = 256, GX_TLUT_4K = 256,
GX_TLUT_8K = 512, GX_TLUT_8K = 512,
GX_TLUT_16K = 1024, GX_TLUT_16K = 1024
} GXTlutSize; } GXTlutSize;
typedef struct _GXVtxAttrFmtList { typedef struct _GXVtxAttrFmtList {

2
include/dolphin/gx/GXVerify.h
View file

@ -7,7 +7,7 @@ typedef enum {
GX_WARN_NONE, GX_WARN_NONE,
GX_WARN_SEVERE, GX_WARN_SEVERE,
GX_WARN_MEDIUM, GX_WARN_MEDIUM,
GX_WARN_ALL, GX_WARN_ALL
} GXWarningLevel; } GXWarningLevel;
#ifdef _DEBUG #ifdef _DEBUG

4
include/dolphin/vitypes.h
View file

@ -50,12 +50,12 @@ typedef enum {
// GCA // GCA
VI_TVMODE_GCA_INT = VI_TVMODE(VI_GCA, VI_INTERLACE), VI_TVMODE_GCA_INT = VI_TVMODE(VI_GCA, VI_INTERLACE),
VI_TVMODE_GCA_DS = VI_TVMODE(VI_GCA, VI_NON_INTERLACE), VI_TVMODE_GCA_DS = VI_TVMODE(VI_GCA, VI_NON_INTERLACE),
VI_TVMODE_GCA_PROG = VI_TVMODE(VI_GCA, VI_PROGRESSIVE), VI_TVMODE_GCA_PROG = VI_TVMODE(VI_GCA, VI_PROGRESSIVE)
} VITVMode; } VITVMode;
typedef enum { typedef enum {
VI_XFBMODE_SF = 0, VI_XFBMODE_SF = 0,
VI_XFBMODE_DF = 1, VI_XFBMODE_DF = 1
} VIXFBMode; } VIXFBMode;
typedef void (*VIPositionCallback)(s16 x, s16 y); typedef void (*VIPositionCallback)(s16 x, s16 y);