diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/code_800F0390.c | 2 | ||||
| -rw-r--r-- | src/code/z_actor.c | 4 | ||||
| -rw-r--r-- | src/code/z_effect_soft_sprite_old_init.c | 4 | ||||
| -rw-r--r-- | src/code/z_en_item00.c | 8 | ||||
| -rw-r--r-- | src/code/z_play.c | 2 |
5 files changed, 8 insertions, 12 deletions
diff --git a/src/code/code_800F0390.c b/src/code/code_800F0390.c index 423b9048c..f495cfe5e 100644 --- a/src/code/code_800F0390.c +++ b/src/code/code_800F0390.c @@ -6,6 +6,6 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/code_800F0390/func_800F048C.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F0390/func_800F0568.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F0390/Audio_PlaySoundAtPosition.s") #pragma GLOBAL_ASM("asm/non_matchings/code/code_800F0390/func_800F0590.s") diff --git a/src/code/z_actor.c b/src/code/z_actor.c index fd6580f51..b13f22043 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -766,7 +766,7 @@ void Actor_FreeOverlay(ActorOverlay* entry) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BB8EC.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BBA88.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Enemy_StartFinishingBlow.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BBAC0.s") @@ -866,7 +866,7 @@ Actor* func_800BE0B8(GlobalContext* globalCtx, Actor* inActor, s16 arg2, u8 arg3 #pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BE184.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BE22C.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/Actor_ApplyDamage.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800BE258.s") diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index 51b382c88..39cc4af73 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -566,7 +566,6 @@ void EffectSsHahen_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, * - due to how life is implemented it is capped at 200. Any value over 200 is accepted, but the fragment will * only live for 200 frames */ -#ifdef NON_MATCHING void EffectSsHahen_SpawnBurst(GlobalContext* globalCtx, Vec3f* pos, f32 burstScale, s16 unused, s16 scale, s16 randScaleRange, s16 count, s16 objId, s16 life, Gfx* dList) { s32 i; @@ -585,9 +584,6 @@ void EffectSsHahen_SpawnBurst(GlobalContext* globalCtx, Vec3f* pos, f32 burstSca life, dList); } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/EffectSsHahen_SpawnBurst.s") -#endif extern Vec3f D_801AE3E0; diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 467fcb597..13be40c0a 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -871,7 +871,7 @@ EnItem00* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, u32 pa (EnItem00*)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, 40, NA_SE_EV_BUTTERFRY_TO_FAIRY); + Audio_PlaySoundAtPosition(globalCtx, spawnPos, 40, NA_SE_EV_BUTTERFRY_TO_FAIRY); } } else { // TODO: fix cast, this actor is not an EnItem00 @@ -880,7 +880,7 @@ EnItem00* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, u32 pa ((((param7F00 >> 8) & 0x7F) & 0x7F) << 9) | 7); if (param20000 == 0) { if (!Actor_GetCollectibleFlag(globalCtx, (param7F00 >> 8) & 0x7F)) { - func_800F0568(globalCtx, spawnPos, 40, NA_SE_EV_BUTTERFRY_TO_FAIRY); + Audio_PlaySoundAtPosition(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, 40, NA_SE_EV_BUTTERFRY_TO_FAIRY); + Audio_PlaySoundAtPosition(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, 40, NA_SE_EV_BUTTERFRY_TO_FAIRY); + Audio_PlaySoundAtPosition(globalCtx, spawnPos, 40, NA_SE_EV_BUTTERFRY_TO_FAIRY); return; } diff --git a/src/code/z_play.c b/src/code/z_play.c index 05b0c8b40..8f15c577a 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -86,7 +86,7 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/Play_GetCamera.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_8016970C.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/Play_CameraSetAtEye.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_8016981C.s") |