mirror of
https://github.com/izzy2lost/Diddy-Kong-Racing.git
synced 2026-06-19 01:16:26 -07:00
More matches and labels (#259)
* match func_80077268 * Update borders.c * Update borders.h * game.c labels * rename border * match func_80068BF4 and func_80069484 * Update camera.c * camera.c labels * more camera.c documentation oh god this is gonna be another one of THOSE PR's again isn't it? * Update camera.c * destruction * nonmatching func_80002DF8 * make clean now removes the linker * Update unknown_003260.c * match func_800A0EB4 * match render_background * fix warnings * style fixes * label indicator arrows in the UI * requested changes * struct renames * match func_800A7B68 * Update README.md * match func_800A5A64 * Fix unforgivable typo sorry im not a fake fan I sware on me nan * Update README.md
This commit is contained in:
+8
-1
@@ -76,9 +76,16 @@
|
||||
#define G_MTX_DKR_INDEX_2 0x80
|
||||
#define G_MW_BILLBOARD 0x02 //0x01 = billboarding enabled, 0x00 = disabled
|
||||
#define G_MW_MVMATRIX 0x0A //Specifies the index of the modelview matrix.
|
||||
#define gDkrInsertMatrix(pkt, where, num) \
|
||||
|
||||
#define gDkrInsertMatrix(pkt, where, num) \
|
||||
gMoveWd(pkt, G_MW_MVMATRIX, where, num)
|
||||
|
||||
#define gDkrEnableBillboard(pkt) \
|
||||
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); \
|
||||
|
||||
+11
-6
@@ -7,17 +7,18 @@
|
||||
/**
|
||||
* Keeps the value within the range.
|
||||
*/
|
||||
#define CLAMP(x, low, high) { \
|
||||
if ((x) > (high)) (x) = (high); \
|
||||
if ((x) < (low)) (x) = (low); \
|
||||
#define CLAMP(x, low, high) { \
|
||||
if ((x) > (high)) (x) = (high); \
|
||||
if ((x) < (low)) (x) = (low); \
|
||||
}
|
||||
|
||||
/**
|
||||
* Allows an arbitrary range the number can wrap around.
|
||||
* Often used for angles, to keep them within s16 bounds while stored in an s32.
|
||||
*/
|
||||
#define WRAP(x, low, high) { \
|
||||
if ((x) > (high)) (x) -= ((high) * 2) - 1; \
|
||||
if ((x) < (low)) (x) += ((high) * 2) - 1; \
|
||||
#define WRAP(x, low, high) { \
|
||||
if ((x) > (high)) (x) -= ((high) * 2) - 1; \
|
||||
if ((x) < (low)) (x) += ((high) * 2) - 1; \
|
||||
}
|
||||
|
||||
s16 arctan2_f(f32 y, f32 x);
|
||||
@@ -25,5 +26,9 @@ f32 sine_s(s16 angle);
|
||||
f32 cosine_s(s16 angle);
|
||||
void func_80031130(s32, f32*, f32*, s32);
|
||||
s32 func_80031600(f32*, f32*, f32*, s8* surface, s32, s32*);
|
||||
void func_80070130(Matrix, s32, f32, f32);
|
||||
void func_80070638(Matrix, f32, f32, f32);
|
||||
void func_8006FE04(Matrix*, f32);
|
||||
void func_8006FE30(Matrix*, f32);
|
||||
|
||||
#endif // MATH_UTIL_H
|
||||
|
||||
+1
-1
@@ -266,7 +266,7 @@ enum SoundID {
|
||||
/* 0x00FB */ SOUND_VOICE_BLUEY_HAHA4,
|
||||
/* 0x00FC */ SOUND_UNK_FC,
|
||||
/* 0x00FD */ SOUND_CROWD,
|
||||
/* 0x00FE */ SOUND_MENU_PICK4,
|
||||
/* 0x00FE */ SOUND_HUD_LAP_TICK,
|
||||
/* 0x00FF */ SOUND_UNK_FF,
|
||||
/* 0x0100 */ SOUND_VOICE_TT_LAP2,
|
||||
/* 0x0101 */ SOUND_VOICE_TT_FINAL_LAP,
|
||||
|
||||
+1
-1
@@ -960,7 +960,7 @@ typedef struct Object_Racer {
|
||||
/* 0x18E */ s16 shieldTimer;
|
||||
/* 0x190 */ s16 unk190;
|
||||
/* 0x192 */ s8 unk192;
|
||||
/* 0x193 */ s8 unk193;
|
||||
/* 0x193 */ s8 lapCount;
|
||||
/* 0x194 */ s8 unk194;
|
||||
/* 0x195 */ s8 unk195;
|
||||
/* 0x196 */ s16 unk196;
|
||||
|
||||
Reference in New Issue
Block a user