mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-04 10:48:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Importing Sound Effects from MM3D (#179)

Browse Source 
* Add sfx & update Audio_PlayActorSound2

* more sfx

* Match Enemies sfxId

* Update with PR

* Update sfx for new pr

* Fix commit
This commit is contained in:
engineer124
2021-06-12 11:08:47 +10:00
committed by GitHub
parent 54aef44a9e
commit c203b9b606
34 changed files with 2803 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+5 -5
View File
@@ -1541,7 +1541,7 @@ void CollisionCheck_SpawnShieldParticlesMetalSound(GlobalContext* globalCtx, Vec
void CollisionCheck_SpawnShieldParticlesMetal2(GlobalContext* globalCtx, Vec3f* v);
void CollisionCheck_SpawnShieldParticlesWood(GlobalContext* globalCtx, Vec3f* v, Vec3f* pos);
s32 CollisionCheck_CylSideVsLineSeg(f32 radius, f32 height, f32 offset, Vec3f* actorPos, Vec3f* itemPos, Vec3f* itemProjPos, Vec3f* out1, Vec3f* out2);
void func_800E8EA0(GlobalContext* globalCtx, Actor* actor, u16 param_3);
void func_800E8EA0(GlobalContext* globalCtx, Actor* actor, u16 textId);
s32 nop_800E8ED0(UNK_TYPE4 param_1);
void nop_800E8EE0(UNK_TYPE4 param_1);
s32 nop_800E8EEC(UNK_TYPE4 param_1);
@@ -2882,7 +2882,7 @@ void func_8014ADBC(GlobalContext* globalCtx, UNK_PTR puParm2);
void func_80150D08(GlobalContext* globalCtx, u32 uParm2);
// void func_801514B0(void);
void func_801518B0(GlobalContext* globalCtx, u32 uParm2, Actor* uParm3);
void func_80151938(GlobalContext* globalCtx, u16 param_2);
void func_80151938(GlobalContext* globalCtx, u16 textId);
void func_80151A68(GlobalContext* globalCtx, u16 param_2);
void func_80151BB4(GlobalContext* globalCtx, u32 uParm2);
// void func_80151C9C(void);
@@ -3844,8 +3844,8 @@ void func_8019E014(void);
// void func_8019EB2C(void);
// void func_8019F024(void);
// void func_8019F05C(void);
void play_sound(u16 param_1);
void func_8019F128(u16 param_1);
void play_sound(u16 sfxId);
void func_8019F128(u16 sfxId);
// void func_8019F170(void);
void func_8019F1C0(Vec3f* pos, u16 sfxId);
void func_8019F208(void);
@@ -3861,7 +3861,7 @@ void func_8019F230(void);
// void func_8019F780(void);
// void func_8019F7D8(void);
// void func_8019F830(void);
void func_8019F88C(Vec3f* arg0, UNK_TYPE arg1, UNK_TYPE arg2);
void func_8019F88C(Vec3f* arg0, u16 sfxId, UNK_TYPE arg2);
// void func_8019F900(void);
// void func_8019FA18(void);
void func_8019FAD8(Vec3f* param_1, u16 param_2, f32 param_3);
include/sfx.h
+2662
View File
File diff suppressed because it is too large Load Diff
include/z64.h
+1
View File
@@ -17,6 +17,7 @@
#include <xstdio.h>
#include <unk.h>
#include <sfx.h>
#include <color.h>
#include <ichain.h>