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

Get within a flea's something or other of 37% (#285)

Browse Source 
* match func_800A4154

* match func_800A497C

* nonmatching func_800A8474

* match func_800A3884

* Update game_ui.h

* quick fixes

* match func_800A4F50 and func_800A45F0

* Update game_ui.h

* prelim

* match func_8009CD7C and func_800AAFD0

* nonmatching func_800AC5A4

* warning

* smilng emote

* match func_800AC5A4

* Update weather.h

* Update weather.c

* fix a buncha warnings

* Update game_ui.c

* match func_80092E94

* I know what menu_5 is now :)

* Update game_ui.c

* Update menu.c

* match func_80068514

* match func_800B695C and func_800B69FC

* match func_8000FC6C

* quick fixes
This commit is contained in:
Fazana
2022-11-15 17:45:22 +00:00
committed by GitHub
parent b07b0b79c9
commit 04bee9fc2d
42 changed files with 777 additions and 2046 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/f3ddkr.h
+10
View File
@@ -19,6 +19,7 @@
#define DKR_CC_UNK9 PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0
#define DKR_CC_UNK10 TEXEL0, 0, SCALE, 0, 0, 0, 0, TEXEL0
#define DKR_CC_UNK11 ENVIRONMENT, TEXEL0, ENV_ALPHA, TEXEL0, TEXEL0, 0, PRIMITIVE, 0
#define DKR_CC_UNK12 0, 0, 0, ENVIRONMENT, 0, 0, 0, TEXEL0
#define DKR_CC_ENVIRONMENT 0, 0, 0, ENVIRONMENT, 0, 0, 0, ENVIRONMENT
#define DKR_CC_DECALFADEPRIM 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0
@@ -95,6 +96,9 @@
_g->words.w1 = (unsigned int)(address); \
}
#define gSPVertexDKR(pkt, v, n, v0) \
gDma1p(pkt, G_VTX, v, (((n) * 8 + (n)) << 1) + 8,((n)-1)<<3|(((u32)(v) & 6))|(v0))
#define TRIN_DISABLE_TEXTURE 0
#define TRIN_ENABLE_TEXTURE 1
@@ -107,6 +111,12 @@
_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); \
_g->words.w1 = (unsigned int)(ptr); \
}
#define numberOfGfxCommands(gfxCmds) (sizeof(gfxCmds) / sizeof(Gwords))
#define gDkrDmaDisplayList(pkt, address, numberOfCommands) \
include/structs.h
+39 -27
View File
@@ -463,30 +463,36 @@ typedef struct ObjectModel_44 {
} ObjectModel_44;
typedef struct ObjectModel {
/* 0x00 */ TextureInfo *textures;
/* 0x04 */ Vertex *vertices;
/* 0x08 */ Triangle *triangles;
/* 0x0C */ s32 *unkC;
/* 0x10 */ s32 *unk10;
u8 pad0[0x0B];
/* 0x1F */ s8 unk1F;
u8 pad20[2];
/* 0x22 */ s16 numberOfTextures;
/* 0x24 */ s16 numberOfVertices;
/* 0x26 */ s16 numberOfTriangles;
/* 0x28 */ s16 numberOfBatches;
u8 pad2A[4];
/* 0x2E */ u8 unk2E;
/* 0x30 */ s16 unk30;
u8 pad32[6];
/* 0x38 */ TriangleBatchInfo *batches;
/* 0x3C */ u8 pad3C[4];
/* 0x40 */ s32 *unk40;
/* 0x44 */ ObjectModel_44 *animations;
/* 0x48 */ s16 numberOfAnimations;
/* 0x4A */ u8 pad4A[6];
/* 0x50 */ s16 unk50;
} ObjectModel;
/* 0x00 */ TextureInfo* textures;
/* 0x04 */ Vertex* vertices;
/* 0x08 */ Triangle* triangles;
/* 0x0C */ s32* unkC;
/* 0x10 */ s32* unk10;
/* 0x14 */ u8 unk14[0x4];
/* 0x18 */ s32 unk18;
/* 0x1A */ s8 unk1A;
/* 0x1C */ s8 unk1C;
/* 0x1E */ s8 unk1E;
/* 0x1F */ s8 unk1F;
/* 0x20 */ u8 pad20[2];
/* 0x22 */ s16 numberOfTextures;
/* 0x24 */ s16 numberOfVertices;
/* 0x26 */ s16 numberOfTriangles;
/* 0x28 */ s16 numberOfBatches;
/* 0x2A */ u8 pad2A[4];
/* 0x2E */ u8 unk2E;
/* 0x2F */ char pad2F[1];
/* 0x30 */ s16 unk30;
/* 0x32 */ u8 pad32[6];
/* 0x38 */ TriangleBatchInfo* batches;
/* 0x3C */ u8 pad3C[4];
/* 0x40 */ s32* unk40;
/* 0x44 */ ObjectModel_44* animations;
/* 0x48 */ s16 numberOfAnimations;
/* 0x4A */ u8 pad4A[6];
/* 0x50 */ s16 unk50;
/* 0x52 */ s16 unk52;
} ObjectModel;
/* Size: 0x44 bytes */
typedef struct LevelModelSegment {
@@ -657,7 +663,7 @@ typedef struct Object_50 {
} Object_50;
typedef struct Object_54 {
s32 unk0;
f32 unk0;
u8 unk4;
u8 unk5;
u8 unk6;
@@ -672,6 +678,9 @@ typedef struct Object_54 {
s16 unk12;
s16 unk14;
s16 unk16;
u8 unk18;
u8 unk19;
u8 unk1A;
} Object_54;
typedef struct Object_5C {
@@ -682,6 +691,8 @@ typedef struct Object_5C {
typedef struct Object_60 {
s32 unk0;
void *unk4; // Object* pointer
u8 unk8[0x24];
s32 *unk2C;
} Object_60;
struct Object;
@@ -1316,7 +1327,8 @@ typedef struct Object_68 {
};
/* 0x04 */ s32 *unk4[3];
/* 0x10 */ s16 unk10;
/* 0x14 */ u8 pad14[13];
/* 0x14 */ u8 pad14[12];
/* 0x1E */ s8 unk1E;
/* 0x1F */ s8 unk1F;
/* 0x20 */ s8 unk20;
/* 0x21 */ s8 unk21;
@@ -1388,7 +1400,7 @@ typedef struct ObjectSegment {
/* Size: 0x0630 bytes */
typedef struct Object {
/* 0x0000 */ ObjectSegment segment;
/* 0x0044 */ void *unk44;
/* 0x0044 */ s32 *unk44;
/* 0x0048 */ s16 behaviorId;
/* 0x004A */ s16 unk4A;
/* 0x004C */ Object_4C *unk4C; //player + 0x318