summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorIsghj <42048411+isghj5@users.noreply.github.com>2021-03-24 01:58:25 -0700
committerGitHub <noreply@github.com>2021-03-24 03:58:25 -0500
commite64d4d8bf27c55e64819afb9cfa8d993a1e5c246 (patch)
treead4285ba1c751c4307fec0a381ec7690a793f57c /src/code
parent1a2e6d7ffe675de5409067e902de0f7ff87449dd (diff)
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 <Rozelette@users.noreply.github.com> * 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 <isghj8@gmail.com> Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
Diffstat (limited to 'src/code')
-rw-r--r--src/code/z_actor.c2
1 files changed, 1 insertions, 1 deletions
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")