mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-09-07 10:41:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

rename some texture (#698)

Browse Source 
* rename some texture

* ok document drifting effect and player particle

* continue rename

* push more rename

* more documentation

* minor rename test

* continue rename texture

* continue rename

* some rename

* more rename

* other fix

* fix comment

* fix a missing I

* fix a mistake

---------

Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
This commit is contained in:
coco875
2025-12-08 17:10:45 +01:00
committed by GitHub
parent 6839dbe4df
commit 362f2012d0
37 changed files with 2635 additions and 2573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/PR/gbi.h
+12 -30
View File
@@ -1983,10 +1983,7 @@ typedef union {
_g->words.w0 = _SHIFTL(G_TRI1, 24, 8) | __gsSP1Triangle_w1f(v0, v1, v2, flag); \
_g->words.w1 = 0; \
}
#define gsSP1Triangle(v0, v1, v2, flag) \
{ \
{ _SHIFTL(G_TRI1, 24, 8) | __gsSP1Triangle_w1f(v0, v1, v2, flag), 0 } \
}
#define gsSP1Triangle(v0, v1, v2, flag) { { _SHIFTL(G_TRI1, 24, 8) | __gsSP1Triangle_w1f(v0, v1, v2, flag), 0 } }
/***
*** Line
@@ -1998,10 +1995,7 @@ typedef union {
_g->words.w0 = _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, 0, flag); \
_g->words.w1 = 0; \
}
#define gsSPLine3D(v0, v1, flag) \
{ \
{ _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, 0, flag), 0 } \
}
#define gsSPLine3D(v0, v1, flag) { { _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, 0, flag), 0 } }
/***
*** LineW
@@ -2019,10 +2013,7 @@ typedef union {
_g->words.w0 = _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, wd, flag); \
_g->words.w1 = 0; \
}
#define gsSPLineW3D(v0, v1, wd, flag) \
{ \
{ _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, wd, flag), 0 } \
}
#define gsSPLineW3D(v0, v1, wd, flag) { { _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, wd, flag), 0 } }
/***
*** 1 Quadrangle
@@ -2102,14 +2093,12 @@ typedef union {
/***
*** 1 Quadrangle
***/
#define gSP1Quadrangle(v0, v1, v2, v3, flag) \
{ \
{ \
Gfx* _g = (Gfx*) (pkt); \
\
_g->words.w0 = _SHIFTL(G_QUAD, 24, 8); \
_g->words.w1 = __gsSP1Quadrangle_w1(v0, v1, v2, v3); \
} \
#define gSP1Quadrangle(v0, v1, v2, v3, flag) \
{ { Gfx* _g = (Gfx*) (pkt); \
\
_g->words.w0 = _SHIFTL(G_QUAD, 24, 8); \
_g->words.w1 = __gsSP1Quadrangle_w1(v0, v1, v2, v3); \
} \
}
#define gsSP1Quadrangle(v0, v1, v2, v3, flag) \
@@ -2613,8 +2602,7 @@ typedef union {
#define gsSPLookAtY(l) gsDma1p(G_MOVEMEM, l, sizeof(Light), G_MV_LOOKATY)
#endif /* F3DEX_GBI_2 */
#define gSPLookAt(pkt, la) \
{ gSPLookAtX(pkt, la) gSPLookAtY(pkt, (char*) (la) + 16) }
#define gSPLookAt(pkt, la) { gSPLookAtX(pkt, la) gSPLookAtY(pkt, (char*) (la) + 16) }
#define gsSPLookAt(la) gsSPLookAtX(la), gsSPLookAtY((char*) (la) + 16)
#define gDPSetHilite1Tile(pkt, tile, hilite, width, height) \
@@ -2767,10 +2755,7 @@ typedef union {
_g->words.w1 = 0; \
}
#define gsSPEndDisplayList() \
{ \
{ _SHIFTL(G_ENDDL, 24, 8), 0 } \
}
#define gsSPEndDisplayList() { { _SHIFTL(G_ENDDL, 24, 8), 0 } }
#ifdef F3DEX_GBI_2
/*
@@ -3994,10 +3979,7 @@ typedef union {
_g->words.w1 = 0; \
}
#define gsDPNoParam(cmd) \
{ \
{ _SHIFTL(cmd, 24, 8), 0 } \
}
#define gsDPNoParam(cmd) { { _SHIFTL(cmd, 24, 8), 0 } }
#define gDPParam(pkt, cmd, param) \
{ \
include/common_structs.h
+20 -4
View File
@@ -149,9 +149,9 @@ typedef struct {
/* 0x0C */ f32 scale;
/* 0x10 */ u16 unk_010;
/* 0x12 */ u16 type;
/* 0x14 */ f32 unk_014;
/* 0x14 */ f32 surfaceType;
/* 0x18 */ f32 unk_018;
/* 0x1C */ s16 IsAlive;
/* 0x1C */ s16 isAlive;
/* 0x1E */ s16 timer;
/* 0x20 */ s16 rotation;
/* 0x22 */ s16 unk_022;
@@ -328,7 +328,7 @@ typedef struct {
/* 0x01F8 */ f32 unk_1F8;
/* 0x01FC */ f32 unk_1FC;
/* 0x0200 */ u32 unk_200; // May be s32. but less casting required if u32
/* 0x0204 */ s16 unk_204;
/* 0x0204 */ s16 driftDuration;
/* 0x0206 */ s16 unk_206;
/* 0x0208 */ f32 unk_208;
/* 0x020C */ f32 unk_20C;
@@ -353,7 +353,10 @@ typedef struct {
/* 0x024C */ u16 animGroupSelector[4];
/* 0x0254 */ u16 characterId;
/* 0x0256 */ u16 unk_256;
/* 0x0258 */ Particle particles[40];
/* 0x0258 */ Particle particlePool0[10];
/* 0x0258 */ Particle particlePool1[10];
/* 0x0258 */ Particle particlePool2[10];
/* 0x0258 */ Particle particlePool3[10];
/* 0x0D98 */ s16 unk_D98;
/* 0x0D9A */ s16 unk_D9A;
/* 0x0D9C */ f32 unk_D9C;
@@ -377,6 +380,19 @@ typedef struct {
/* 0x0DD4 */ // s16 unk_DD4;
} Player; // size = 0xDD8
enum POOL_1_PARTICLE_TYPES {
NO_PARTICLE,
DRIFT_PARTICLE,
GROUND_PARTICLE,
GRASS_PARTICLE,
POOL_1_PARTICLE_TYPE_4,
POOL_1_PARTICLE_TYPE_5,
POOL_1_PARTICLE_TYPE_6,
POOL_1_PARTICLE_TYPE_7,
POOL_1_PARTICLE_TYPE_8,
POOL_1_PARTICLE_TYPE_9
};
typedef struct {
// Something related to time trial ghost data?
/* 0x00 */ s32 unk_00;
include/defines.h
+6 -6
View File
@@ -73,12 +73,12 @@
// Float version required for matching
#ifdef VERSION_EU
#define COURSE_TIMER_ITER 0.020041665999999999 // 1 / 50
#ifdef AVOID_UB
#define COURSE_TIMER_ITER_f 0.020041665999999999f // 1 / 50
#else
#define COURSE_TIMER_ITER_f 0.01666666f //! 1 / 60 - Float unchanged in EU
#endif
#define COURSE_TIMER_ITER 0.020041665999999999 // 1 / 50
#ifdef AVOID_UB
#define COURSE_TIMER_ITER_f 0.020041665999999999f // 1 / 50
#else
#define COURSE_TIMER_ITER_f 0.01666666f //! 1 / 60 - Float unchanged in EU
#endif
#else
#define COURSE_TIMER_ITER 0.01666666 // 1 / 60
#define COURSE_TIMER_ITER_f 0.01666666f // 1 / 60
include/libc/stddef.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include <PR/ultratypes.h>
#ifndef offsetof
#define offsetof(st, m) ((size_t) & (((st*) 0)->m))
#define offsetof(st, m) ((size_t) &(((st*) 0)->m))
#endif
#endif
include/segments.h
+18 -18
View File
@@ -45,11 +45,11 @@ extern u8 _startupLogoSegmentRomEnd[];
// Defines duplicated even if the same for both for easier readability
#ifdef AVOID_UB
#define MEMORY_POOL_START (uintptr_t) & _memoryPoolSegmentNoloadStart[0]
#define MEMORY_POOL_END (uintptr_t) & _memoryPoolSegmentNoloadEnd[0]
#define MEMORY_POOL_START (uintptr_t) &_memoryPoolSegmentNoloadStart[0]
#define MEMORY_POOL_END (uintptr_t) &_memoryPoolSegmentNoloadEnd[0]
#define SEG_ENDING (uintptr_t) & _endingSegmentStart[0]
#define SEG_ENDING_ROM_START (uintptr_t) & _endingSegmentRomStart[0]
#define SEG_ENDING (uintptr_t) &_endingSegmentStart[0]
#define SEG_ENDING_ROM_START (uintptr_t) &_endingSegmentRomStart[0]
/**
* Ending segment original size is 0xDF00 but much of that remains unused.
* This auto fits the segment to its proper size.
@@ -57,20 +57,20 @@ extern u8 _startupLogoSegmentRomEnd[];
#define SEG_ENDING_SIZE (size_t) ALIGN16((ptrdiff_t) (&_endingSegmentNoloadEnd[0] - &_endingSegmentStart[0]))
#define SEG_ENDING_ROM_SIZE (size_t) ALIGN16((ptrdiff_t) (&_endingSegmentRomEnd[0] - &_endingSegmentRomStart[0]))
#define SEG_RACING (uintptr_t) & _racingSegmentStart[0]
#define SEG_RACING_ROM_START (uintptr_t) & _racingSegmentRomStart[0]
#define SEG_RACING (uintptr_t) &_racingSegmentStart[0]
#define SEG_RACING_ROM_START (uintptr_t) &_racingSegmentRomStart[0]
#define SEG_RACING_SIZE (size_t) ALIGN16((ptrdiff_t) (&_racingSegmentNoloadEnd[0] - &_racingSegmentStart[0]))
#define SEG_RACING_ROM_SIZE (size_t) ALIGN16((ptrdiff_t) (&_racingSegmentRomEnd[0] - &_racingSegmentRomStart[0]))
#define TRIG_TABLES (uintptr_t) & _trigTablesSegmentStart[0]
#define TRIG_TABLES_ROM_START (uintptr_t) & _trigTablesSegmentRomStart[0]
#define TRIG_TABLES (uintptr_t) &_trigTablesSegmentStart[0]
#define TRIG_TABLES_ROM_START (uintptr_t) &_trigTablesSegmentRomStart[0]
#define TRIG_TABLES_SIZE (size_t) _trigTablesSegmentSize
#define SEG_DATA_START (uintptr_t) & _data_segment2SegmentRomStart[0]
#define SEG_DATA_END (uintptr_t) & _data_segment2SegmentRomEnd[0]
#define SEG_DATA_START (uintptr_t) &_data_segment2SegmentRomStart[0]
#define SEG_DATA_END (uintptr_t) &_data_segment2SegmentRomEnd[0]
#define COMMON_TEXTURES_ROM_START (uintptr_t) & _common_texturesSegmentRomStart[0]
#define COMMON_TEXTURES_SIZE (ptrdiff_t)(&_common_texturesSegmentRomEnd[0] - &_common_texturesSegmentRomStart[0])
#define COMMON_TEXTURES_ROM_START (uintptr_t) &_common_texturesSegmentRomStart[0]
#define COMMON_TEXTURES_SIZE (ptrdiff_t) (&_common_texturesSegmentRomEnd[0] - &_common_texturesSegmentRomStart[0])
#define CEREMONY_DATA_ROM_START &_ceremonyDataSegmentRomStart[0]
#define CEREMONY_DATA_ROM_END &_ceremonyDataSegmentRomEnd[0]
@@ -80,7 +80,7 @@ extern u8 _startupLogoSegmentRomEnd[];
#else // Required for ok
#define MEMORY_POOL_START (uintptr_t) & _memoryPoolSegmentNoloadStart
#define MEMORY_POOL_START (uintptr_t) &_memoryPoolSegmentNoloadStart
#define MEMORY_POOL_END (uintptr_t) 0x80242F00
#define SEG_ENDING (uintptr_t) 0x80280000
@@ -96,15 +96,15 @@ extern u8 _startupLogoSegmentRomEnd[];
#define SEG_RACING_ROM_SIZE (size_t) ALIGN16((ptrdiff_t) (&_racingSegmentRomEnd[0] - &_racingSegmentRomStart[0]))
#define TRIG_TABLES (uintptr_t) 0x802BA370
#define TRIG_TABLES_ROM_START (uintptr_t) & _trigTablesSegmentRomStart[0]
#define TRIG_TABLES_ROM_START (uintptr_t) &_trigTablesSegmentRomStart[0]
#define TRIG_TABLES_SIZE (size_t) 0x5810
#define SEG_DATA_START (uintptr_t) & _data_segment2SegmentRomStart[0]
#define SEG_DATA_END (uintptr_t) & _data_segment2SegmentRomEnd[0]
#define SEG_DATA_START (uintptr_t) &_data_segment2SegmentRomStart[0]
#define SEG_DATA_END (uintptr_t) &_data_segment2SegmentRomEnd[0]
#define COMMON_TEXTURES_ROM_START (uintptr_t) & _common_texturesSegmentRomStart[0]
#define COMMON_TEXTURES_ROM_START (uintptr_t) &_common_texturesSegmentRomStart[0]
#define COMMON_TEXTURES_SIZE \
(ptrdiff_t)((uintptr_t) & _common_texturesSegmentRomEnd - (uintptr_t) & _common_texturesSegmentRomStart)
(ptrdiff_t) ((uintptr_t) &_common_texturesSegmentRomEnd - (uintptr_t) &_common_texturesSegmentRomStart)
#define CEREMONY_DATA_ROM_START &_ceremonyDataSegmentRomStart[0]
#define CEREMONY_DATA_ROM_END &_ceremonyDataSegmentRomEnd[0]