From 0e51bf35a169f3f73c7fb7e9f31f6ccafb4ebb25 Mon Sep 17 00:00:00 2001 From: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Date: Mon, 5 Jul 2021 22:47:55 +0100 Subject: EnFirefly OK and mostly documented (#194) * Data imported, 8/30 functions done * OK * Delete ASM references, add SFX * Named functions * more naming * Type the nop ActorFunc correctly * A couple more bits of documentation * Sorted object_script * Merge remote-tracking branch 'upstream/master' into Firefly * format * Update other includes * Review suggestions * Review changes; named Actor_Noop * Format --- 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 2ceef0159..4a947be9c 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -846,7 +846,7 @@ void Actor_FreeOverlay(ActorOverlay* entry) { #pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDCF4.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDFB0.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_Noop.asm") #pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BDFC0.asm") -- cgit v1.2.3