mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-09-06 18:31:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decomped trophy & podium models. Modified gbi.h (#28)

Browse Source 
* Decompiled trophy & podium models, fixed mk_gbi.h
This commit is contained in:
CoderStig
2021-07-31 18:39:06 -06:00
committed by GitHub
parent f5b22811bb
commit e69d8ba395
10 changed files with 2846 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/PR/gbi.h
+20 -1
View File
@@ -153,6 +153,7 @@
# define G_TRI2 (G_IMMFIRST-14)
# define G_BRANCH_Z (G_IMMFIRST-15)
# define G_LOAD_UCODE (G_IMMFIRST-16)
# define G_QUAD (G_IMMFIRST-10)
#else
# define G_RDPHALF_CONT (G_IMMFIRST-13)
#endif
@@ -2170,12 +2171,30 @@ typedef union {
_g->words.w1 = __gsSP1Quadrangle_w2f(v0, v1, v2, v3, flag); \
}
// unmodified gsSP1Quadrangle
#ifdef NON_MATCHING_GBI
#define gsSP1Quadrangle(v0, v1, v2, v3, flag) \
{{ \
{{ \
(_SHIFTL(G_TRI2, 24, 8)| \
__gsSP1Quadrangle_w1f(v0, v1, v2, v3, flag)), \
__gsSP1Quadrangle_w2f(v0, v1, v2, v3, flag) \
}}
#else
/**
* Modified to match startup_logo.inc.c
* Likely due to a development version of gbi.h
*/
#define __mk_gsSP1Triangle_w1(v0, v1, v2, v3) \
(_SHIFTL((v3)*2,24,8)|_SHIFTL((v0)*2,16,8)|_SHIFTL((v1)*2,8,8)|_SHIFTL((v2)*2,0,8))
#define gsSP1Quadrangle(v0, v1, v2, v3) \
{{ \
_SHIFTL(G_QUAD, 24, 8), \
__mk_gsSP1Triangle_w1(v0, v1, v2, v3) \
}}
#endif /* NON_MATCHING */
#endif /* F3DEX_GBI_2 */
#if (defined(F3DLP_GBI)||defined(F3DEX_GBI))
include/mk_gbi.h
-11
View File
@@ -1,11 +0,0 @@
#include <PR/gbi.h>
#define __mk_gsSPLine3D_w1f(v0, v1, v2, v3) \
(_SHIFTR((v3), 0,8)|_SHIFTL((v2), 8, 8)| \
_SHIFTL((v1), 16, 8)|_SHIFTL((v0), 24, 8))
#define mk_Line3D(v0, v1, v2, v3) \
{{ \
_SHIFTL(G_LINE3D, 24, 8)|0, \
__mk_gsSPLine3D_w1f(v0, v1, v2, v3) \
}}
include/types.h
+6 -1
View File
@@ -67,7 +67,12 @@ typedef struct {
s8 flag[2]; /* unk flag */
u8 ca[4]; /* color & alpha */
} mk_Vtx_Logo;
} mk_Vtx_Flag;
typedef struct {
s8 ob[3];
s8 unk;
} coursePath;
struct courseTable {
u32 *dlRomStart; // 0x00 ROM start for segment 6 DL data