diff options
| author | EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> | 2021-07-05 22:47:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-05 17:47:55 -0400 |
| commit | 0e51bf35a169f3f73c7fb7e9f31f6ccafb4ebb25 (patch) | |
| tree | 796919621cb1129f64b6db3024208efe10c68ddd /src/code | |
| parent | e57fb5780d488786895e6cb0c6e872255986d045 (diff) | |
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
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 2 |
1 files changed, 1 insertions, 1 deletions
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") |