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

Convert Asset20 to Object_Boost and convert unk80068514_arg4 to Sprite (#569)

Browse Source 
* Convert Asset20 to Object_Boost and convert unk80068514_arg4 to Sprite

* clean up some SoundHandle warnings

* Fix many warnings

* Rename racer_sound_init

* Fix last warning and format
This commit is contained in:
Ryan Myers
2025-05-13 20:33:44 -04:00
committed by GitHub
parent 8a58156c3d
commit 0f5d0e0e43
21 changed files with 175 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/structs.h
+16 -6
View File
@@ -156,7 +156,10 @@ typedef struct Sprite {
/* 0x02 */ s16 numberOfFrames; // 1 means static texture
/* 0x04 */ s16 numberOfInstances;
/* 0x06 */ s16 drawFlags;
/* 0x08 */ TextureHeader **frames;
union {
/* 0x08 */ TextureHeader **frames;
/* 0x08 */ Gfx *gfx[1];
};
union {
/* 0x0C */ u8 val[1]; // Actual size varies.
/* 0x0C */ u8 *ptr[1]; // Display list?
@@ -1017,8 +1020,8 @@ typedef struct Object_Weapon {
/* 0x14 */ s16 unk16;
/* 0x18 */ u8 weaponID;
/* 0x19 */ s8 checkpoint;
/* 0x19 */ s16 unk1A;
/* 0x19 */ SoundHandle soundMask;
/* 0x1A */ s16 unk1A;
/* 0x1C */ struct AudioPoint *soundMask;
} Object_Weapon;
typedef struct Object_Butterfly {
@@ -1059,19 +1062,25 @@ typedef struct Object_Boost_Inner {
Vec3f position;
f32 unkC;
f32 unk10;
u8 pad[0x24 - 0x14];
f32 unk14;
f32 unk18;
f32 unk1C;
f32 unk20;
} Object_Boost_Inner;
typedef struct Object_Boost {
Object_Boost_Inner unk0;
Object_Boost_Inner unk24;
Object_Boost_Inner unk48;
u8 pad6C[4];
s16 unk6C;
s16 unk6E;
u8 unk70;
u8 unk71;
u8 unk72;
u8 unk73;
s8 unk73;
f32 unk74;
Sprite *unk78;
TextureHeader *unk7C;
} Object_Boost;
typedef struct Object_EffectBox {
@@ -1642,6 +1651,7 @@ typedef struct Object_CharacterSelect {
s8 pad42;
s8 unk43;
} Object_CharacterSelect;
typedef struct Object_64 {
union {
Object_Laser laser;