mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-27 23:36:22 +00:00
Code Issues Projects Releases Wiki Activity

Fix prototype for Audio_PlaySoundGeneral and fix related types in structs (#481)

Browse source
This commit is contained in:
Tharo 2020-11-16 08:31:08 +00:00 committed by GitHub
parent 3d21a38f08
commit 93389da2dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/functions.h
View file

@ -2317,7 +2317,7 @@ void func_800F711C();
void func_800F7260(u16); void func_800F7260(u16);
void func_800F72B8(u8); void func_800F72B8(u8);
void func_800F731C(u8); void func_800F731C(u8);
void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* a1, u8 a2, u32* a3, u32* a4, u32* a5); void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* a1, u8 a2, f32* a3, f32* a4, f32* a5);
// ? func_800F74E0(?); // ? func_800F74E0(?);
void func_800F7680(void); void func_800F7680(void);
void func_800F7B54(u8, u8); void func_800F7B54(u8, u8);

6
include/z64audio.h
View file

@ -747,9 +747,9 @@ typedef struct {
/* 0x04 */ f32* posY; /* 0x04 */ f32* posY;
/* 0x08 */ f32* posZ; /* 0x08 */ f32* posZ;
/* 0x0C */ u8 unk_C; /* 0x0C */ u8 unk_C;
/* 0x10 */ u32* unk_10; /* 0x10 */ f32* unk_10;
/* 0x14 */ u32* unk_14; /* 0x14 */ f32* unk_14;
/* 0x18 */ u32* unk_18; /* 0x18 */ f32* unk_18;
/* 0x1C */ f32 unk_1C; /* 0x1C */ f32 unk_1C;
/* 0x20 */ u32 unk_20; /* 0x20 */ u32 unk_20;
/* 0x24 */ u8 unk_24; /* 0x24 */ u8 unk_24;

8
src/code/code_800F7260.c
View file

@ -6,9 +6,9 @@ typedef struct {
/* 0x00 */ u16 sfxId; /* 0x00 */ u16 sfxId;
/* 0x04 */ Vec3f* pos; /* 0x04 */ Vec3f* pos;
/* 0x08 */ u8 unk_8; /* 0x08 */ u8 unk_8;
/* 0x0C */ u32* unk_C; /* 0x0C */ f32* unk_C;
/* 0x10 */ u32* unk_10; /* 0x10 */ f32* unk_10;
/* 0x14 */ u32* unk_14; /* 0x14 */ f32* unk_14;
} Struct_800F738C; // size = 0x18 } Struct_800F738C; // size = 0x18
typedef struct { typedef struct {
@ -125,7 +125,7 @@ void func_800F731C(u8 arg0) {
} }
} }
void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* a1, u8 a2, u32* a3, u32* a4, u32* a5) { void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* a1, u8 a2, f32* a3, f32* a4, f32* a5) {
u8 i; u8 i;
Struct_800F738C* phi_v0; Struct_800F738C* phi_v0;