From 37fc242e228feb32f408234d6664bcf6ec949406 Mon Sep 17 00:00:00 2001 From: engineer124 <47598039+engineer124@users.noreply.github.com> Date: Thu, 29 Jul 2021 12:45:13 +1000 Subject: En_Minislime OK and Documented (#231) * Get Minislime code from Bigslime Branch * format * PR Feedback, add Damage Effects Enum, add +1 use of Room Coordinates Macro --- src/code/z_actor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/code') diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 99679f1c7..5741d2a29 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -757,9 +757,9 @@ void Actor_FreeOverlay(ActorOverlay* entry) { #pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_LoadOverlay.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SpawnWithParentAndCutscene.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SpawnAsChildAndCutscene.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SpawnWithParent.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SpawnAsChild.asm") #pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_SpawnTransitionActors.asm") -- cgit v1.2.3