diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-01-29 05:51:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-29 10:51:59 -0300 |
| commit | 6fb4a073257379b562c2ddec74583fd8b83fb0a2 (patch) | |
| tree | fa62646f182d94c9138ff4a8f49b0e7437916978 /src/code/z_actor.c | |
| parent | 0729b150a39c86957d68cb36f2fbe1485b38f750 (diff) | |
General Cleanup 3 (#1543)
* voicestopread -> voicestopreaddata
* PadMgr_ThreadEntry
* PointLight_t
* OS_VI_UNK28
* print stuff
* Remove OS_PRIORITY_THREADTAIL
* sBoeDlists -> sBoeModelInfo
* Prerender_DrawBackground2D
* segments
* Revert "print stuff"
This reverts commit 1d833e2f0d2e013d73ab9c4826fac8efefdc830b.
* format
* Update src/overlays/actors/ovl_En_Mkk/z_en_mkk.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Diffstat (limited to 'src/code/z_actor.c')
| -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 937b986e6..5f3593f76 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3394,10 +3394,10 @@ Actor* Actor_SpawnAsChildAndCutscene(ActorContext* actorCtx, PlayState* play, s1 Actor_AddToCategory(actorCtx, actor, actorInit->type); { - u32 sp20 = gSegments[6]; + uintptr_t prevSeg = gSegments[0x06]; Actor_Init(actor, play); - gSegments[6] = sp20; + gSegments[0x06] = prevSeg; } return actor; |