mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-23 15:01:32 -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
src/code/code_0x800E8EA0.c
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.h>
#include <global.h>
void func_800E8EA0(GlobalContext* globalCtx, Actor* actor, u16 param_3) {
func_80151938(globalCtx, param_3);
actor->textId = param_3;
void func_800E8EA0(GlobalContext* globalCtx, Actor* actor, u16 textId) {
func_80151938(globalCtx, textId);
actor->textId = textId;
}
s32 nop_800E8ED0(UNK_TYPE4 param_1) {
src/code/z_collision_check.c
+14 -14
View File
@@ -1486,9 +1486,9 @@ void CollisionCheck_HitSolid(GlobalContext* globalCtx, ColliderInfo* info, Colli
if (flags == TOUCH_SFX_NORMAL && collider->colType != COLTYPE_METAL) {
EffectSsHitMark_SpawnFixedScale(globalCtx, 0, hitPos);
if (collider->actor == NULL) {
play_sound(0x1806);
play_sound(NA_SE_IT_SHIELD_BOUND);
} else {
func_8019F1C0(&collider->actor->projectedPos, 0x1806);
func_8019F1C0(&collider->actor->projectedPos, NA_SE_IT_SHIELD_BOUND);
}
} else if (flags == TOUCH_SFX_NORMAL) {
EffectSsHitMark_SpawnFixedScale(globalCtx, 3, hitPos);
@@ -1500,16 +1500,16 @@ void CollisionCheck_HitSolid(GlobalContext* globalCtx, ColliderInfo* info, Colli
} else if (flags == TOUCH_SFX_HARD) {
EffectSsHitMark_SpawnFixedScale(globalCtx, 0, hitPos);
if (collider->actor == NULL) {
play_sound(0x1806);
play_sound(NA_SE_IT_SHIELD_BOUND);
} else {
func_8019F1C0(&collider->actor->projectedPos, 0x1806);
func_8019F1C0(&collider->actor->projectedPos, NA_SE_IT_SHIELD_BOUND);
}
} else if (flags == TOUCH_SFX_WOOD) {
EffectSsHitMark_SpawnFixedScale(globalCtx, 1, hitPos);
if (collider->actor == NULL) {
play_sound(0x1837);
play_sound(NA_SE_IT_REFLECTION_WOOD);
} else {
func_8019F1C0(&collider->actor->projectedPos, 0x1837);
func_8019F1C0(&collider->actor->projectedPos, NA_SE_IT_REFLECTION_WOOD);
}
}
}
@@ -1520,9 +1520,9 @@ void CollisionCheck_HitSolid(GlobalContext* globalCtx, ColliderInfo* info, Colli
s32 CollisionCheck_SwordHitAudio(Collider* at, ColliderInfo* acInfo) {
if (at->actor != NULL && at->actor->category == ACTORCAT_PLAYER) {
if (acInfo->elemType == ELEMTYPE_UNK0) {
func_8019F1C0(&at->actor->projectedPos, 0x1811);
func_8019F1C0(&at->actor->projectedPos, NA_SE_IT_SWORD_STRIKE);
} else if (acInfo->elemType == ELEMTYPE_UNK1) {
func_8019F1C0(&at->actor->projectedPos, 0x1824);
func_8019F1C0(&at->actor->projectedPos, NA_SE_IT_SWORD_STRIKE_HARD);
} else if (acInfo->elemType == ELEMTYPE_UNK2) {
func_8019F1C0(&at->actor->projectedPos, 0);
} else if (acInfo->elemType == ELEMTYPE_UNK3) {
@@ -1566,7 +1566,7 @@ void CollisionCheck_HitEffects(GlobalContext* globalCtx, Collider* at, ColliderI
} else if (sHitInfo[ac->colType].effect == HIT_WOOD) {
if (at->actor == NULL) {
CollisionCheck_SpawnShieldParticles(globalCtx, hitPos);
play_sound(0x1837);
play_sound(NA_SE_IT_REFLECTION_WOOD);
} else {
CollisionCheck_SpawnShieldParticlesWood(globalCtx, hitPos, &at->actor->projectedPos);
}
@@ -1579,9 +1579,9 @@ void CollisionCheck_HitEffects(GlobalContext* globalCtx, Collider* at, ColliderI
} else {
EffectSsHitMark_SpawnFixedScale(globalCtx, 0, hitPos);
if (ac->actor == NULL) {
play_sound(0x1806);
play_sound(NA_SE_IT_SHIELD_BOUND);
} else {
func_8019F1C0(&ac->actor->projectedPos, 0x1806);
func_8019F1C0(&ac->actor->projectedPos, NA_SE_IT_SHIELD_BOUND);
}
}
}
@@ -3860,7 +3860,7 @@ void CollisionCheck_SpawnShieldParticles(GlobalContext* globalCtx, Vec3f* v) {
*/
void CollisionCheck_SpawnShieldParticlesMetal(GlobalContext* globalCtx, Vec3f* v) {
CollisionCheck_SpawnShieldParticles(globalCtx, v);
play_sound(0x1808);
play_sound(NA_SE_IT_SHIELD_REFLECT_SW);
}
/**
@@ -3868,7 +3868,7 @@ void CollisionCheck_SpawnShieldParticlesMetal(GlobalContext* globalCtx, Vec3f* v
*/
void CollisionCheck_SpawnShieldParticlesMetalSound(GlobalContext* globalCtx, Vec3f* v, Vec3f* pos) {
CollisionCheck_SpawnShieldParticles(globalCtx, v);
func_8019F1C0(pos, 0x1808);
func_8019F1C0(pos, NA_SE_IT_SHIELD_REFLECT_SW);
}
/**
@@ -3908,7 +3908,7 @@ void CollisionCheck_SpawnShieldParticlesWood(GlobalContext* globalCtx, Vec3f* v,
shieldParticleInitWood.lightPoint.z = shieldParticleInitWood.position.z;
Effect_Add(globalCtx, &effectIndex, 3, 0, 1, &shieldParticleInitWood);
func_8019F1C0(pos, 0x1837);
func_8019F1C0(pos, NA_SE_IT_REFLECTION_WOOD);
}
/**
src/code/z_effect_soft_sprite_old_init.c
+3 -3
View File
@@ -794,7 +794,7 @@ void EffectSsEnIce_SpawnFlyingVec3f(GlobalContext* globalCtx, Actor* actor, Vec3
initParams.scale = scale;
if (actor != NULL) {
Audio_PlayActorSound2(actor, 0x874);
Audio_PlayActorSound2(actor, NA_SE_PL_FREEZE_S);
}
EffectSs_Spawn(globalCtx, EFFECT_SS_EN_ICE, 80, &initParams);
@@ -895,7 +895,7 @@ void EffectSsEnFire_SpawnVec3f(GlobalContext* globalCtx, Actor* actor, Vec3f* po
initParams.bodyPart = bodyPart;
if (actor != NULL) {
Audio_PlayActorSound2(actor, 0x2822);
Audio_PlayActorSound2(actor, NA_SE_EV_FLAME_IGNITION);
}
EffectSs_Spawn(globalCtx, EFFECT_SS_EN_FIRE, 128, &initParams);
@@ -915,7 +915,7 @@ void EffectSsEnFire_SpawnVec3s(GlobalContext* globalCtx, Actor* actor, Vec3s* po
initParams.bodyPart = bodyPart;
if (actor != NULL) {
Audio_PlayActorSound2(actor, 0x2822);
Audio_PlayActorSound2(actor, NA_SE_EV_FLAME_IGNITION);
}
EffectSs_Spawn(globalCtx, EFFECT_SS_EN_FIRE, 128, &initParams);
src/code/z_en_item00.c
+6 -6
View File
@@ -598,7 +598,7 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
}
if ((this->actor.params <= ITEM00_RUPEE_RED) || (this->actor.params == ITEM00_RUPEE_ORANGE)) {
play_sound(0x4803);
play_sound(NA_SE_SY_GET_RUPY);
} else if (getItemId != GI_NONE) {
if (Actor_HasParent(&this->actor, globalCtx)) {
Actor_SetCollectibleFlag(globalCtx, this->collectibleFlag);
@@ -606,7 +606,7 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
}
return;
} else {
play_sound(0x4824);
play_sound(NA_SE_SY_GET_ITEM);
}
Actor_SetCollectibleFlag(globalCtx, this->collectibleFlag);
@@ -872,7 +872,7 @@ EnItem00* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, u32 pa
spawnedActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f,
spawnPos->z, 0, 0, 0, ((((param7F00 >> 8) & 0x7F) << 9) & 0xFE00) | 0x102);
if (!Actor_GetCollectibleFlag(globalCtx, (param7F00 >> 8) & 0x7F)) {
func_800F0568(globalCtx, spawnPos, 0x28, 0x28E7);
func_800F0568(globalCtx, spawnPos, 40, NA_SE_EV_BUTTERFRY_TO_FAIRY);
}
} else {
spawnedActor =
@@ -880,7 +880,7 @@ EnItem00* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, u32 pa
spawnPos->z, 0, 0, 0, ((((param7F00 >> 8) & 0x7F) & 0x7F) << 9) | 7);
if (param20000 == 0) {
if (!Actor_GetCollectibleFlag(globalCtx, (param7F00 >> 8) & 0x7F)) {
func_800F0568(globalCtx, spawnPos, 0x28, 0x28E7);
func_800F0568(globalCtx, spawnPos, 40, NA_SE_EV_BUTTERFRY_TO_FAIRY);
}
}
}
@@ -947,7 +947,7 @@ Actor* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, u32 para
spawnPos->z, 0, 0, 0, ((((param7F00 >> 8) & 0x7F) & 0x7F) << 9) | 7);
}
if (Actor_GetCollectibleFlag(globalCtx, (param7F00 >> 8) & 0x7F) == 0) {
func_800F0568(globalCtx, spawnPos, 0x28, 0x28E7);
func_800F0568(globalCtx, spawnPos, 40, NA_SE_EV_BUTTERFRY_TO_FAIRY);
}
} else {
params = func_800A7650(params);
@@ -1105,7 +1105,7 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3
if (gSaveContext.health < 0x11) {
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f,
spawnPos->z, 0, 0, 0, 2);
func_800F0568(globalCtx, spawnPos, 0x28, 0x28E7);
func_800F0568(globalCtx, spawnPos, 40, NA_SE_EV_BUTTERFRY_TO_FAIRY);
return;
}
src/code/z_lib.c
+2 -2
View File
@@ -648,8 +648,8 @@ void func_801000CC(u16 sfxId) {
func_8019F128(sfxId);
}
void func_801000F4(s32 a0, u16 a1) {
func_8019F1C0(a0, a1);
void func_801000F4(s32 a0, u16 sfxId) {
func_8019F1C0(a0, sfxId);
}
void Lib_Vec3f_TranslateAndRotateY(Vec3f* translation, s16 a, Vec3f* src, Vec3f* dst) {