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

We are battling in Darkwater Beach. (1 opponent remains) (#409)

Browse Source 
* func_8000418C WIP

* func_8000418C progress

* Mach func_80030664

* Match func_80030DE0

* func_8001CC48 NON_MATCHING

* Match func_8001B3C4

* Match func_80036040

* Match func_8001EFA4

* Match func_80016C68

* Update README

* Remove func_80030DE0 asm

* Update src/objects.c

Co-authored-by: David Benepe <benepe96@gmail.com>

* Match free_hud

---------

Co-authored-by: David Benepe <benepe96@gmail.com>
This commit is contained in:
Ryan Myers
2023-09-23 18:20:08 -04:00
committed by GitHub
co-authored by David Benepe
parent 888e4cde8b
commit fd40898eee
23 changed files with 421 additions and 890 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/level_object_entries.h
+20 -14
View File
@@ -333,9 +333,10 @@ typedef struct LevelObjectEntry_Animation {
/* 0x10 */ s8 actorIndex;
/* 0x11 */ s8 order;
/* 0x12 */ s8 objAnimIndex;
/* 0x13 */ u8 pad13;
/* 0x13 */ s8 unk13;
/* 0x14 */ s8 nodeSpeed;
/* 0x15 */ u8 pad15[2];
/* 0x15 */ s8 unk15;
/* 0x16 */ u8 unk16;
/* 0x17 */ s8 objAnimSpeed;
/* 0x18 */ u8 objAnimLoopType; // 0 = Loop, 1 = Reverse loop, 2 = Play once, 3 = reverse once then stop.
/* 0x19 */ u8 rotateType;
@@ -343,20 +344,25 @@ typedef struct LevelObjectEntry_Animation {
/* 0x1B */ s8 rollSpinSpeed;
/* 0x1C */ s8 pitchSpinSpeed;
/* 0x1D */ u8 goToNode;
/* 0x1E */ u8 pad1E[3];
/* 0x1E */ u8 unk1E;
/* 0x1F */ s8 unk1F;
/* 0x20 */ s8 unk20;
/* 0x21 */ s8 channel;
/* 0x22 */ u8 pad22[2];
/* 0x24 */ s8 pauseFrameCount;
/* 0x25 */ u8 pad25;
/* 0x26 */ u8 specialHide;
/* 0x22 */ s8 unk22;
/* 0x23 */ s8 unk23;
/* 0x24 */ s16 pauseFrameCount;
/* 0x26 */ s8 specialHide;
/* 0x27 */ u8 messageId;
/* 0x28 */ u8 pad28[3];
/* 0x2B */ u8 fadeAlpha;
/* 0x2C */ u8 nextAnim;
/* 0x2D */ u8 pad2D;
/* 0x2E */ u8 soundEffect;
/* 0x2F */ u8 fadeOptions; // 1 = Start fading from fadeAlpha, 2 = make visible, 3 = make invisible.
/* 0x30 */ u8 pad30[2];
/* 0x28 */ s8 unk28;
/* 0x29 */ s8 unk29;
/* 0x2A */ s8 unk2A;
/* 0x2B */ s8 fadeAlpha;
/* 0x2C */ s8 nextAnim;
/* 0x2D */ s8 unk2D;
/* 0x2E */ s8 soundEffect;
/* 0x2F */ s8 fadeOptions; // 1 = Start fading from fadeAlpha, 2 = make visible, 3 = make invisible.
/* 0x30 */ s8 unk30;
/* 0x31 */ u8 unk31;
} LevelObjectEntry_Animation;
typedef struct LevelObjectEntry_InfoPoint {
include/sound_ids.h
+1 -1
View File
@@ -601,7 +601,7 @@ enum SoundID {
/* 0x0249 */ SOUND_DRAWBRIDGE_BELL,
/* 0x024A */ SOUND_BUBBLE_RISE,
/* 0x024B */ SOUND_VOICE_TT_BEAT_MY_TIME, // "Now try beat my time"
/* 0x024C */ SOUND_VOICE_TT_WELL_THEN,
/* 0x024C */ SOUND_VOICE_TT_WELL_DONE,
/* 0x024D */ SOUND_VOICE_TT_TRY_ANOTHER_TRACK, // "Now try another track"
/* 0x024E */ SOUND_VOICE_TT_BEAT_ALL_TIMES, // "You've beaten all my times"
/* 0x024F */ SOUND_VOICE_TT_UNLOCKED, // "Now you can pick me"
include/structs.h
+39 -1
View File
@@ -897,7 +897,45 @@ typedef struct Object_Animator {
} Object_Animator;
typedef struct Object_Animation {
/* 0x00 */ u8 pad0[0x4A];
/* 0x00 */ f32 unk0;
/* 0x04 */ f32 unk4;
/* 0x08 */ f32 unk8;
/* 0x0C */ s32 unkC;
/* 0x10 */ f32 unk10;
/* 0x14 */ f32 unk14;
/* 0x18 */ u8 *unk18;
/* 0x1C */ struct Object *unk1C;
/* 0x20 */ s32 unk20;
/* 0x24 */ s16 unk24;
/* 0x26 */ s16 unk26;
/* 0x28 */ u16 unk28;
/* 0x2A */ u16 unk2A;
/* 0x2C */ u8 unk2C;
/* 0x2D */ u8 unk2D;
/* 0x2E */ u8 unk2E;
/* 0x2F */ u8 unk2F;
/* 0x30 */ u8 unk30;
/* 0x31 */ u8 unk31;
/* 0x32 */ u8 unk32;
/* 0x33 */ u8 unk33;
/* 0x34 */ u8 unk34;
/* 0x35 */ u8 unk35;
/* 0x36 */ s16 unk36;
/* 0x38 */ u8 unk38;
/* 0x39 */ u8 unk39;
/* 0x3A */ u8 unk3A;
/* 0x3V */ u8 unk3B;
/* 0x3C */ u8 unk3C;
/* 0x3D */ u8 unk3D;
/* 0x3E */ u8 unk3E;
/* 0x3F */ u8 unk3F;
/* 0x40 */ u8 unk40;
/* 0x41 */ u8 unk41;
/* 0x42 */ u8 unk42;
/* 0x43 */ u8 unk43;
/* 0x44 */ u8 unk44;
/* 0x45 */ u8 unk45;
/* 0x46 */ u8 pad46[4];
/* 0x4A */ s16 unk4A;
} Object_Animation;