From e64d4d8bf27c55e64819afb9cfa8d993a1e5c246 Mon Sep 17 00:00:00 2001 From: Isghj <42048411+isghj5@users.noreply.github.com> Date: Wed, 24 Mar 2021 01:58:25 -0700 Subject: EnPoFusen: OK (#69) * EnPoFusen: OK EnPoFusen: WIP EnPoFusen: init is matched * EnPoFusen: requested changes * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h Co-authored-by: Rozelette * EnPoFusen: forgot I renamed a function to check diff, changed back * EnPoFusen: Bad search and replace * EnPoFusen: really bad search replace * EnPoFusen: ColliderInit and requested changes * Functions: renamed func_800B8EC8 to Audio_PlayActorSound2 Co-authored-by: isghj8 Co-authored-by: Rozelette --- src/code/z_actor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/code') diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 11a7a5ae5..57058949a 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -556,7 +556,7 @@ u32 Actor_HasParent(Actor* actor, GlobalContext* ctxt) { #pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8E58.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8EC8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Audio_PlayActorSound2.asm") #pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8EF4.asm") -- cgit v1.2.3