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

Merge all matches for object_functions.c (#460)

Browse Source
This commit is contained in:
Ryan Myers
2025-02-15 15:43:28 +00:00
committed by GitHub
parent 17fbd96b89
commit cacfdfb20d
10 changed files with 615 additions and 1996 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/level_object_entries.h
+2 -3
View File
@@ -240,7 +240,7 @@ typedef struct LevelObjectEntry_Torch_Mist {
typedef struct LevelObjectEntry_TexScroll {
/* 0x00 */ LevelObjectEntryCommon common;
/* 0x08 */ s16 numTextures;
/* 0x08 */ s16 textureIndex;
/* 0x0A */ s8 unkA;
/* 0x0B */ s8 unkB;
} LevelObjectEntry_TexScroll;
@@ -443,8 +443,7 @@ typedef struct LevelObjectEntry_WaveGenerator {
typedef struct LevelObjectEntry_Butterfly {
/* 0x00 */ LevelObjectEntryCommon common;
/* 0x08 */ u8 unk8;
/* 0x09 */ u8 unk9;
/* 0x08 */ u16 unk8;
/* 0x0A */ u8 unkA;
/* 0x0B */ u8 unkB;
} LevelObjectEntry_Butterfly;
include/structs.h
+4 -4
View File
@@ -1015,8 +1015,8 @@ typedef struct Object_Butterfly {
/* 0x0FD */ u8 unkFD;
/* 0x0FE */ u8 unkFE;
/* 0x0FF */ u8 unkFF;
/* 0x100 */ s32 unk100;
/* 0x104 */ s16 unk104;
/* 0x100 */ struct Object *unk100;
/* 0x104 */ u16 unk104;
/* 0x106 */ s16 unk106;
/* 0x108 */ f32 unk108;
/* 0x10C */ f32 unk10C;
@@ -1130,7 +1130,7 @@ typedef struct Object_AudioReverb {
} Object_AudioReverb;
typedef struct Object_TexScroll {
/* 0x0 */ s16 numTextures;
/* 0x0 */ s16 textureIndex;
/* 0x2 */ s16 pad2;
/* 0x4 */ s16 unk4;
/* 0x6 */ s16 unk6;
@@ -1368,7 +1368,7 @@ typedef struct Object_Racer {
/* 0x1FA */ s8 drifting;
/* 0x1FB */ s8 unk1FB;
/* 0x1FC */ u8 unk1FC;
/* 0x1FD */ u8 unk1FD;
/* 0x1FD */ s8 unk1FD;
/* 0x1FE */ u8 unk1FE;
/* 0x1FF */ u8 unk1FF;
/* 0x200 */ s8 transitionTimer;