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

Decompiled non-matching func_8003DFCC.

Browse Source
This commit is contained in:
Antonio
2021-11-07 20:51:31 -08:00
parent dc42f58661
commit cc8b39a132
3 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/unknown_00BC20.c
-4
View File
@@ -1441,11 +1441,7 @@ void func_800235D0(s32 arg0) {
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800235DC.s")
<<<<<<< HEAD
void func_800238BC(Object *arg0) {
=======
void func_800238BC(Object *arg0, void *arg1) {
>>>>>>> Added 2nd argument to func_800238BC.
arg0->unk48 = arg0->descriptor_ptr->unk54;
switch (arg0->unk48 - 1) {
case 0x00:
src/unknown_00BC20.h
+1 -1
View File
@@ -211,7 +211,7 @@ s8 func_8002341C(void);
s32 func_80023568(void);
s8 func_800235C0(void);
void func_800235D0(s32 arg0);
void func_800238BC(Object *arg0);
void func_800238BC(Object *arg0, void *arg1);
void run_object_loop_func(Object *obj, s32 arg1);
void func_8002458C(s32 arg0);
s16 *func_80024594(s32 *arg0, s32 *arg1);
src/unknown_0348C0.c
+53
View File
@@ -1184,7 +1184,60 @@ void obj_loop_world_key(Object *worldKeyObj, s32 speed) {
worldKeyObj->y_rotation += speed * 256;
}
#ifdef NON_MATCHING
typedef struct unknown_struct_8003DFCC {
u8 pad0[8];
u8 unk8;
u8 unk9;
u8 unkA;
} unknown_struct_8003DFCC;
void func_8003DFCC(Object *arg0, unknown_struct_8003DFCC *arg1) {
f32 temp_f0;
s32 temp_v0;
Object_64 *temp_v0_2;
f32 phi_f0;
arg0->unk4C->unk14 = 2;
arg0->unk4C->unk11 = 4;
arg0->unk4C->unk10 = 0x14;
temp_v0 = get_filtered_cheats();
if (temp_v0 & 0x20000) {
arg1->unk9 = 0U;
} else if (temp_v0 & 0x08000) {
arg1->unk9 = 1U;
} else if (temp_v0 & 0x10000) {
arg1->unk9 = 2U;
} else if (temp_v0 & 0x40000) {
arg1->unk9 = 3U;
} else if (temp_v0 & 0x80000) {
arg1->unk9 = 4U;
}
if ((s32) arg1->unk8 >= 6) {
arg1->unk8 = 0U;
}
if ((s32) arg0->unk3A >= (s32) arg0->descriptor_ptr->unk55) {
arg0->unk3A = 0;
}
arg0->unk3A = (s8) arg1->unk9;
arg0->unk78 = (s32) arg0->unk3A;
phi_f0 = arg1->unkA;
if (arg1->unkA < 10.0f) {
phi_f0 = 10.0f;
}
temp_f0 = phi_f0 / 64.0f;
arg0->scale = (f32) (arg0->descriptor_ptr->unkC * temp_f0);
arg0->unk64->unk4 = 0;
arg0->unk64->unk0_a.unk0 = arg0->scale;
arg0->unk7C.word = 0;
if ((get_filtered_cheats() & 0x800) != 0) {
gParticlePtrList_addObject(arg0);
}
}
#else
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003DFCC.s")
#endif
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003E140.s")
void func_8003E5B0(s32 arg0, s32 arg1) {