mirror of
https://github.com/izzy2lost/Diddy-Kong-Racing.git
synced 2026-06-19 01:16:26 -07:00
Better fit and data type match for functions
This commit is contained in:
+4
-10
@@ -683,21 +683,15 @@ u16 func_80001CB8(u16 arg0) {
|
||||
|
||||
GLOBAL_ASM("asm/non_matchings/audio/func_80001D04.s")
|
||||
|
||||
void func_80001EA8(u16 arg0, s32 arg1, s32 arg2, s32 arg3, s32 *arg4) {
|
||||
s32 temp;
|
||||
|
||||
//Possible "if (debug)"?
|
||||
if (0) { }
|
||||
|
||||
void func_80001EA8(u16 arg0, f32 x, f32 y, f32 z, s32 **arg4) {
|
||||
if (arg4 == NULL) {
|
||||
arg4 = &D_80115F84;
|
||||
}
|
||||
|
||||
func_80001D04(arg0, arg4);
|
||||
|
||||
temp = *arg4;
|
||||
if (temp) {
|
||||
func_80009B7C((s32 *)temp, arg1, arg2, arg3);
|
||||
|
||||
if (*arg4 != NULL) {
|
||||
func_80009B7C(*arg4, x, y, z);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -106,7 +106,7 @@ void play_sound(u8 arg0);
|
||||
u32 func_80001C08(void);
|
||||
void func_80001C5C(u16 arg0);
|
||||
u16 func_80001CB8(u16 arg0);
|
||||
void func_80001EA8(u16 arg0, s32 arg1, s32 arg2, s32 arg3, s32 *arg4);
|
||||
void func_80001EA8(u16 arg0, f32 x, f32 y, f32 z, s32 **arg4);
|
||||
void func_80001F14(u16 sndIndx, u32 *arg1);
|
||||
u16 ALBankFile_80115D14_GetSoundCount(void);
|
||||
u8 ALSeqFile_80115CF8_GetSeqCount(void);
|
||||
@@ -124,6 +124,6 @@ void func_8000232C(ALCSPlayer *seqp, void *ptr, u8 *arg2, ALCSeq *seq); //Non Ma
|
||||
f32 func_800015F8(void); //Non Matching
|
||||
void func_80001FB8(u16 arg0); //Non Matching
|
||||
void func_8000232C(ALCSPlayer *seqp, void *ptr, u8 *arg2, ALCSeq *seq); // Non Matching
|
||||
s32 func_80009B7C(s32 *arg0, s32 arg1, s32 arg2, s32 arg3); // Non Matching
|
||||
void func_80009B7C(s32 *arg0, f32 x, f32 y, f32 z); // Non Matching
|
||||
|
||||
#endif
|
||||
|
||||
+7
-18
@@ -704,23 +704,13 @@ typedef struct unk800570A4 {
|
||||
s8 unk210;
|
||||
} unk800570A4;
|
||||
|
||||
/* Unknown Size */
|
||||
typedef struct unk800570A4_2 {
|
||||
u8 unk0[0xC];
|
||||
s32 unkC;
|
||||
s32 unk10;
|
||||
s32 unk14;
|
||||
u8 unk18[0x4C];
|
||||
unk800570A4 *unk64;
|
||||
} unk800570A4_2;
|
||||
|
||||
/* Unknown Size */
|
||||
typedef struct unk80056930 {
|
||||
u8 unk0[0x3];
|
||||
s8 unk3;
|
||||
} unk80056930;
|
||||
|
||||
void func_80057048(unk800570A4_2 *arg0, s32 arg1);
|
||||
void func_80057048(Object *arg0, s32 arg1);
|
||||
|
||||
void play_char_horn_sound(Object *arg0, Object_64 *arg1) {
|
||||
if (get_filtered_cheats() & CHEAT_HORN_CHEAT) {
|
||||
@@ -735,16 +725,15 @@ void play_char_horn_sound(Object *arg0, Object_64 *arg1) {
|
||||
GLOBAL_ASM("asm/non_matchings/unknown_043920/func_8005698C.s")
|
||||
GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80056E2C.s")
|
||||
|
||||
void func_80001EA8(u16 arg0, s32 arg1, s32 arg2, s32 arg3, s32 *arg4);
|
||||
void func_80057048(unk800570A4_2 *arg0, s32 arg1) {
|
||||
unk800570A4 *temp = arg0->unk64;
|
||||
u16 temp2 = arg1;
|
||||
if (D_8011D55C != -1 && temp->unk108 == 0) {
|
||||
func_80001EA8(temp2, arg0->unkC, arg0->unk10, arg0->unk14, 0);
|
||||
void func_80001EA8(u16 arg0, f32 x, f32 y, f32 z, s32 **arg4);
|
||||
void func_80057048(Object *obj, s32 arg1) {
|
||||
unk800570A4 *obj64 = obj->unk64;
|
||||
if (D_8011D55C != -1 && obj64->unk108 == 0) {
|
||||
func_80001EA8(arg1, obj->x_position, obj->y_position, obj->z_position, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
void func_800570A4(unk800570A4_2 *arg0, s32 arg1, s32 arg2) {
|
||||
void func_800570A4(Object *arg0, s32 arg1, s32 arg2) {
|
||||
unk800570A4 *temp = arg0->unk64;
|
||||
temp->unk20E = arg1;
|
||||
temp->unk210 = arg2;
|
||||
|
||||
Reference in New Issue
Block a user