diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2021-07-29 12:45:13 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 22:45:13 -0400 |
| commit | 37fc242e228feb32f408234d6664bcf6ec949406 (patch) | |
| tree | 870f40e78e2494545ddaad1afce149bb2c2e784b /src/code | |
| parent | 8e2f2b4cdb2b0ea7cc3588710ddb0a71f13eb4d9 (diff) | |
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
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 4 |
1 files changed, 2 insertions, 2 deletions
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") |