izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

lots of renaming, last for now though (#356)

Browse Source 
* background stuff

* last two tasks

* Update unknown_078050.c

* tonnes more

* audio

* Update audio.c

* quick fixes

* and again

* requested changes

* fixed the rest of the macros
This commit is contained in:
Fazana
2023-01-07 14:40:25 +00:00
committed by GitHub
parent 87121c9a3a
commit 7f5f21be50
51 changed files with 4346 additions and 4304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/f3ddkr.h
+1 -19
View File
@@ -85,16 +85,7 @@
gMoveWd(pkt, G_MW_BILLBOARD, 0, 1)
#define gDkrDisableBillboard(pkt) \
gMoveWd(pkt, G_MW_BILLBOARD, 0, 0)
#define gDkrVertices(pkt, address, no, v0) \
{ \
Gfx *_g = (Gfx *)(pkt); \
\
_g->words.w0 = (_SHIFTL(G_VTX, 24, 8) | _SHIFTL((no), 16, 8) | \
_SHIFTL((v0*2), 0, 16)); \
_g->words.w1 = (unsigned int)(address); \
}
gMoveWd(pkt, G_MW_BILLBOARD, 0, 0)
#define gSPVertexDKR(pkt, v, n, v0) \
gDma1p(pkt, G_VTX, v, (((n) * 8 + (n)) << 1) + 8,((n)-1)<<3|(((u32)(v) & 6))|(v0))
@@ -102,15 +93,6 @@
#define TRIN_DISABLE_TEXTURE 0
#define TRIN_ENABLE_TEXTURE 1
#define gDkrTriangles(pkt, address, n, t) \
{ \
Gfx *_g = (Gfx *)(pkt); \
\
_g->words.w0 = (_SHIFTL(G_TRIN, 24, 8) | _SHIFTL((n - 1), 20, 4) | \
_SHIFTL((t), 16, 4) | _SHIFTL((n*16), 0, 16)); \
_g->words.w1 = (unsigned int)(address); \
}
#define gSPPolygon(dl, ptr, numTris, texEnabled) { \
Gfx *_g = (Gfx *)(dl); \
_g->words.w0 = _SHIFTL(((numTris - 1) << 4) | (texEnabled), 16, 8) | _SHIFTL(G_TRIN, 24, 8) | _SHIFTL((numTris*16), 0, 16); \
include/structs.h
+15 -6
View File
@@ -96,6 +96,15 @@ typedef struct DrawTexture {
s16 yOffset; // Offset from the center of the screen.
} DrawTexture;
typedef struct Sprite {
/* 0x00 */ s16 baseTextureId;
/* 0x02 */ s16 numberOfFrames; // 1 means static texture
/* 0x04 */ s16 numberOfInstances;
/* 0x06 */ s16 unk6;
/* 0x08 */ TextureHeader **frames;
/* 0x0C */ u8 *unkC[1]; // Actual size varies.
} Sprite;
/* Size: 0x20 bytes */
typedef struct MenuElement {
// Element Position
@@ -560,11 +569,11 @@ typedef struct LevelModelSegmentBoundingBox {
/* Size: 8 bytes */
typedef struct BspTreeNode {
s16 leftNode; // less than split value
s16 rightNode; // greater or equal to split value?
u8 splitType; // 0 = Camera X, 1 = Camera Y, 2 = Camera Z
u8 segmentIndex;
s16 splitValue; // Decides left or right
/* 0x00 */ s16 leftNode; // less than split value
/* 0x02 */ s16 rightNode; // greater or equal to split value?
/* 0x04 */ u8 splitType; // 0 = Camera X, 1 = Camera Y, 2 = Camera Z
/* 0x05 */ u8 segmentIndex;
/* 0x06 */ s16 splitValue; // Decides left or right
} BspTreeNode;
typedef struct LevelModel {
@@ -578,7 +587,7 @@ typedef struct LevelModel {
/* 0x1A */ s16 numberOfSegments;
/* 0x1C */ s16 unk1C;
/* 0x1E */ s16 unk1E;
/* 0x20 */ s32 unk20; //spriteIndex?
/* 0x20 */ s32 minimapSprite;
/* 0x24 */ u16 unk24;
/* 0x26 */ u16 unk26;
u8 pad28[0x10];