More actor cleanup Part 1 (#107)

* Fix naming and structs in z_en_item00.c and z_en_a_keep.c * Decompile init vars in z_en_item00.c and z_en_a_keep.c * Create missing .h files for the last few actors * Fix some collider member names in actor structs * Fix old actors not properly using "actionFunc" / "SetupAction" * Remove some local temporary actor structs * Fix some actor header includes to be absolute instead of relative
2025-08-07 14:50:15 +00:00 · 2020-05-01 20:26:16 +02:00 · 2020-05-01 20:26:16 +02:00 · 3ca6082084
commit 3ca6082084
parent 2b38920d7e
47 changed files with 625 additions and 582 deletions
--- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
+++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
@ -6,7 +6,7 @@

 #include "z_arrow_fire.h"

-#include "../ovl_En_Arrow/z_en_arrow.h"
+#include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"

 #define FLAGS 0x02000010

--- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
+++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
@ -6,7 +6,7 @@

 #include "z_arrow_ice.h"

-#include "../ovl_En_Arrow/z_en_arrow.h"
+#include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"

 #define FLAGS 0x02000010

--- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
+++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
@ -6,7 +6,7 @@

 #include "z_arrow_light.h"

-#include "../ovl_En_Arrow/z_en_arrow.h"
+#include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"

 #define FLAGS 0x02000010

--- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
+++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
@ -223,7 +223,7 @@ void func_8086D548(BgBdanSwitch* this, GlobalContext* globalCtx) {
 }

 void func_8086D5C4(BgBdanSwitch* this) {
-    this->updateFunc = &func_8086D5E0;
+    this->actionFunc = &func_8086D5E0;
    this->unk_1C8 = 1.0f;
 }

@ -244,7 +244,7 @@ void func_8086D5E0(BgBdanSwitch* this, GlobalContext* globalCtx) {
 }

 void func_8086D67C(BgBdanSwitch* this) {
-    this->updateFunc = &func_8086D694;
+    this->actionFunc = &func_8086D694;
    this->unk_1DA = 0x64;
 }

@ -261,7 +261,7 @@ void func_8086D694(BgBdanSwitch* this, GlobalContext* globalCtx) {

 void func_8086D730(BgBdanSwitch* this) {
    this->unk_1C8 = 0.1f;
-    this->updateFunc = &func_8086D754;
+    this->actionFunc = &func_8086D754;
    this->unk_1D8 = 6;
 }

@ -285,7 +285,7 @@ void func_8086D754(BgBdanSwitch* this, GlobalContext* globalCtx) {
 }

 void func_8086D7FC(BgBdanSwitch* this) {
-    this->updateFunc = &func_8086D80C;
+    this->actionFunc = &func_8086D80C;
 }

 void func_8086D80C(BgBdanSwitch* this, GlobalContext* globalCtx) {
@ -297,7 +297,7 @@ void func_8086D80C(BgBdanSwitch* this, GlobalContext* globalCtx) {
 }

 void func_8086D86C(BgBdanSwitch* this) {
-    this->updateFunc = &func_8086D888;
+    this->actionFunc = &func_8086D888;
    this->unk_1C8 = 1.0f;
 }

@ -308,7 +308,7 @@ void func_8086D888(BgBdanSwitch* this, GlobalContext* globalCtx) {
 }

 void func_8086D8BC(BgBdanSwitch* this) {
-    this->updateFunc = &func_8086D8CC;
+    this->actionFunc = &func_8086D8CC;
 }

 void func_8086D8CC(BgBdanSwitch* this, GlobalContext* globalCtx) {
@ -321,7 +321,7 @@ void func_8086D8CC(BgBdanSwitch* this, GlobalContext* globalCtx) {
 }

 void func_8086D944(BgBdanSwitch* this) {
-    this->updateFunc = &func_8086D95C;
+    this->actionFunc = &func_8086D95C;
    this->unk_1DA = 0x64;
 }

@ -338,7 +338,7 @@ void func_8086D95C(BgBdanSwitch* this, GlobalContext* globalCtx) {

 void func_8086D9F8(BgBdanSwitch* this) {
    this->unk_1C8 = 0.6f;
-    this->updateFunc = &func_8086DA1C;
+    this->actionFunc = &func_8086DA1C;
    this->unk_1D8 = 6;
 }

@ -362,7 +362,7 @@ void func_8086DA1C(BgBdanSwitch* this, GlobalContext* globalCtx) {
 }

 void func_8086DAB4(BgBdanSwitch* this) {
-    this->updateFunc = &func_8086DAC4;
+    this->actionFunc = &func_8086DAC4;
 }

 void func_8086DAC4(BgBdanSwitch* this, GlobalContext* globalCtx) {
@ -375,14 +375,14 @@ void func_8086DAC4(BgBdanSwitch* this, GlobalContext* globalCtx) {

 void func_8086DB24(BgBdanSwitch* this) {
    this->unk_1C8 = 0.1f;
-    this->updateFunc = &func_8086DB40;
+    this->actionFunc = &func_8086DB40;
 }

 void func_8086DB40(BgBdanSwitch* this, GlobalContext* globalCtx) {
 }

 void func_8086DB4C(BgBdanSwitch* this) {
-    this->updateFunc = &func_8086DB68;
+    this->actionFunc = &func_8086DB68;
    this->unk_1C8 = 2.0f;
 }

@ -407,7 +407,7 @@ void func_8086DB68(BgBdanSwitch* this, GlobalContext* globalCtx) {
 }

 void func_8086DC30(BgBdanSwitch* this) {
-    this->updateFunc = &func_8086DC48;
+    this->actionFunc = &func_8086DC48;
    this->unk_1DA = 0x64;
 }

@ -422,7 +422,7 @@ void func_8086DC48(BgBdanSwitch* this, GlobalContext* globalCtx) {
 }

 void func_8086DCCC(BgBdanSwitch* this) {
-    this->updateFunc = &func_8086DCE8;
+    this->actionFunc = &func_8086DCE8;
    this->unk_1C8 = 1.0f;
 }

@ -443,7 +443,7 @@ void func_8086DCE8(BgBdanSwitch* this, GlobalContext* globalCtx) {
 }

 void func_8086DDA8(BgBdanSwitch* this) {
-    this->updateFunc = &func_8086DDC0;
+    this->actionFunc = &func_8086DDC0;
    this->unk_1DA = 0x64;
 }

@ -466,7 +466,7 @@ void BgBdanSwitch_Update(BgBdanSwitch* this, GlobalContext* globalCtx) {
    if (this->unk_1DA > 0) {
        this->unk_1DA -= 1;
    }
-    this->updateFunc(this, globalCtx);
+    this->actionFunc(this, globalCtx);
    func_8086D0EC(this);
    type = this->actor.params & 0xFF;
    if (type != 3 && type != 4) {
--- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h
+++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h
@ -21,7 +21,7 @@ typedef struct {
    /* 0x0158 */ u32 unk_158;
    /* 0x015C */ u32 unk_15C;
    /* 0x0160 */ u8 unk_160;
-    /* 0x0164 */ ActorFunc updateFunc;
+    /* 0x0164 */ ActorFunc actionFunc;
    /* 0x0168 */ ColliderJntSph collider;
    /* 0x0188 */ ColliderJntSphItem colliderItems[1];
    /* 0x01C8 */ f32 unk_1C8;
--- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c
+++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c
@ -6,7 +6,7 @@

 #include "z_bg_bom_guard.h"

-#include "../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h"
+#include "overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h"

 #include <vt.h>

--- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
+++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
@ -92,7 +92,7 @@ void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, GlobalContext* globalCtx) {
 }

 void BgGjyoBridge_Update(BgGjyoBridge* this, GlobalContext* globalCtx) {
-    this->actionFunc(&this->dyna.actor, globalCtx);
+    this->actionFunc(this, globalCtx);
 }

 void BgGjyoBridge_Draw(BgGjyoBridge* this, GlobalContext* globalCtx) {
--- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c
@ -43,7 +43,7 @@ void BgHidanSyoku_Init(BgHidanSyoku* this, GlobalContext* globalCtx) {
    DynaPolyInfo_SetActorMove(&this->dyna.actor, 1);
    DynaPolyInfo_Alloc(&D_0600E568, &local_c);
    this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, local_c);
-    this->updateFunc = func_8088F4B8;
+    this->actionFunc = func_8088F4B8;
    this->dyna.actor.initPosRot.pos.y += 540.0f;
 }

@ -54,13 +54,13 @@ void BgHidanSyoku_Destroy(BgHidanSyoku* this, GlobalContext* globalCtx) {
 void func_8088F47C(BgHidanSyoku* this) {
    this->unk_16A = 0x3C;
    Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND);
-    this->updateFunc = func_8088F62C;
+    this->actionFunc = func_8088F62C;
 }

 void func_8088F4B8(BgHidanSyoku* this, GlobalContext* globalCtx) {
    if (Flags_GetClear(globalCtx, this->dyna.actor.room) && func_8004356C(&this->dyna.actor)) {
        this->unk_16A = 0x8C;
-        this->updateFunc = func_8088F514;
+        this->actionFunc = func_8088F514;
    }
 }

@ -95,15 +95,15 @@ void func_8088F62C(BgHidanSyoku* this, GlobalContext* globalCtx) {
    if (this->unk_16A == 0) {
        this->unk_16A = 0x8c;
        if (this->dyna.actor.posRot.pos.y < this->dyna.actor.initPosRot.pos.y) {
-            this->updateFunc = func_8088F514;
+            this->actionFunc = func_8088F514;
        } else {
-            this->updateFunc = func_8088F5A0;
+            this->actionFunc = func_8088F5A0;
        }
    }
 }

 void BgHidanSyoku_Update(BgHidanSyoku* this, GlobalContext* globalCtx) {
-    this->updateFunc(this, globalCtx);
+    this->actionFunc(this, globalCtx);
    if (func_8004356C(&this->dyna.actor)) {
        if (this->unk_168 == 0) {
            this->unk_168 = 3;
--- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h
@ -6,7 +6,7 @@

 typedef struct {
    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x0164 */ ActorFunc updateFunc;
+    /* 0x0164 */ ActorFunc actionFunc;
    /* 0x0168 */ s16 unk_168;
    /* 0x016A */ s16 unk_16A;
 } BgHidanSyoku; // size = 0x016C
--- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c
@ -69,7 +69,7 @@ void BgJyaAmishutter_Destroy(BgJyaAmishutter* this, GlobalContext* globalCtx) {
 }

 void func_808933BC(BgJyaAmishutter* this) {
-    this->updateFunc = func_808933CC;
+    this->actionFunc = func_808933CC;
 }

 void func_808933CC(BgJyaAmishutter* this) {
@ -81,7 +81,7 @@ void func_808933CC(BgJyaAmishutter* this) {
 }

 void func_80893428(BgJyaAmishutter* this) {
-    this->updateFunc = func_80893438;
+    this->actionFunc = func_80893438;
 }

 void func_80893438(BgJyaAmishutter* this) {
@ -94,7 +94,7 @@ void func_80893438(BgJyaAmishutter* this) {
 }

 void func_808934B0(BgJyaAmishutter* this) {
-    this->updateFunc = func_808934C0;
+    this->actionFunc = func_808934C0;
 }

 void func_808934C0(BgJyaAmishutter* this) {
@ -104,7 +104,7 @@ void func_808934C0(BgJyaAmishutter* this) {
 }

 void func_808934FC(BgJyaAmishutter* this) {
-    this->updateFunc = func_8089350C;
+    this->actionFunc = func_8089350C;
 }

 void func_8089350C(BgJyaAmishutter* this) {
@ -117,7 +117,7 @@ void func_8089350C(BgJyaAmishutter* this) {
 }

 void BgJyaAmishutter_Update(BgJyaAmishutter* this, GlobalContext* globalCtx) {
-    this->updateFunc(this);
+    this->actionFunc(this);
 }

 void BgJyaAmishutter_Draw(BgJyaAmishutter* this, GlobalContext* globalCtx) {
--- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h
@ -8,7 +8,7 @@ typedef struct {
    /* 0x0000 */ Actor actor;
    /* 0x014C */ u32 dynaPolyId;
    /* 0x0150 */ char unk_150[0x14];
-    /* 0x0164 */ void (*updateFunc)(Actor*);
+    /* 0x0164 */ void (*actionFunc)(Actor*);
 } BgJyaAmishutter; // size = 0x0168

 extern const ActorInit Bg_Jya_Amishutter_InitVars;
--- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c
@ -71,7 +71,7 @@ void BgJyaKanaami_Destroy(BgJyaKanaami* this, GlobalContext* globalCtx) {
 }

 void func_80899880(BgJyaKanaami* this) {
-    this->updateFunc = func_80899894;
+    this->actionFunc = func_80899894;
    this->unk_16A = 0;
 }

@ -88,7 +88,7 @@ void func_80899894(BgJyaKanaami* this, GlobalContext* globalCtx) {
 }

 void func_8089993C(BgJyaKanaami* this) {
-    this->updateFunc = func_80899950;
+    this->actionFunc = func_80899950;
    this->unk_168 = 0;
 }

@ -107,13 +107,13 @@ void func_80899950(BgJyaKanaami* this, GlobalContext* globalCtx) {
 }

 void func_80899A08(BgJyaKanaami* this) {
-    this->updateFunc = 0;
+    this->actionFunc = 0;
    this->actor.posRot.rot.x = 0x4000;
 }

 void BgJyaKanaami_Update(BgJyaKanaami* this, GlobalContext* globalCtx) {
-    if (this->updateFunc) {
-        this->updateFunc(this, globalCtx);
+    if (this->actionFunc != NULL) {
+        this->actionFunc(this, globalCtx);
    }
    this->actor.shape.rot.x = this->actor.posRot.rot.x;
 }
--- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h
+++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h
@ -8,7 +8,7 @@ typedef struct {
    /* 0x0000 */ Actor actor;
    /* 0x014C */ u32 dynaPolyId;
    /* 0x014C */ char unk_150[0x14];
-    /* 0x0164 */ ActorFunc updateFunc;
+    /* 0x0164 */ ActorFunc actionFunc;
    /* 0x0168 */ s16 unk_168;
    /* 0x016A */ s16 unk_16A;
 } BgJyaKanaami; // size = 0x016C
--- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
+++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
@ -269,7 +269,7 @@ void func_808BB128(BgTokiSwd* this, GlobalContext* globalCtx) {
 }

 void BgTokiSwd_Update(BgTokiSwd* this, GlobalContext* globalCtx) {
-    this->actionFunc(&this->actor, globalCtx);
+    this->actionFunc(this, globalCtx);
    CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider);
 }

--- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
+++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
@ -6,7 +6,9 @@

 typedef struct {
    /* 0x0000 */ Actor actor;
-    /* 0x014C */ char unk_14C[0x5D0];
+    /* 0x014C */ char unk_14C[0x5CC];
+    /* 0x0718 */ s16 organFadeTimer;
+    /* 0x071A */ char unk_71A[0x2];
 } BossGanon; // size = 0x071C

 extern const ActorInit Boss_Ganon_InitVars;
--- a/src/overlays/actors/ovl_En_Bird/z_en_bird.c
+++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.c
@ -4,28 +4,7 @@
 * Description: A brown bird. Tweet tweet.
 */

-#include <ultra64.h>
-#include <global.h>
-
-typedef struct {
-    /* 0x0000 */ Actor actor;
-    /* 0x014C */ SkelAnime skelAnime;
-    /* 0x0190 */ ActorFunc updateFunc;
-    /* 0x0194 */ u32 unk_194;
-    /* 0x0198 */ s32 unk_198;
-    /* 0x019C */ s16 unk_19C;
-    /* 0x019E */ char unk_19E[0x2];
-    /* 0x01A0 */ f32 unk_1A0;
-    /* 0x01A4 */ f32 unk_1A4;
-    /* 0x01A8 */ f32 unk_1A8;
-    /* 0x01AC */ f32 unk_1AC;
-    /* 0x01B0 */ f32 unk_1B0;
-    /* 0x01B4 */ f32 unk_1B4;
-    /* 0x01B8 */ f32 unk_1B8;
-    /* 0x01BC */ f32 unk_1BC;
-    /* 0x01C0 */ s16 unk_1C0;
-    /* 0x01C2 */ char unk_1C2[0x1A];
-} EnBird; // size = 0x01C4
+#include "z_en_bird.h"

 #define FLAGS 0x00000000

@ -35,7 +14,7 @@ void EnBird_Update(EnBird* this, GlobalContext* globalCtx);
 void EnBird_Draw(EnBird* this, GlobalContext* globalCtx);
 void func_809C1E00(EnBird* this, s16 params);
 void func_809C1E40(EnBird* this, GlobalContext* globalCtx);
-void EnBird_SetNewUpdate(EnBird* this, ActorFunc updateFunc);
+void EnBird_SetupAction(EnBird* this, ActorFunc actionFunc);
 void func_809C1D60(EnBird* this, GlobalContext* globalCtx);
 void func_809C1CAC(EnBird* this, s16 params);

@ -58,8 +37,8 @@ static InitChainEntry initChain[] = {
 extern AnimationHeader D_0600006C;
 extern SkeletonHeader D_06002190;

-void EnBird_SetNewUpdate(EnBird* this, ActorFunc newUpdateFunc) {
-    this->updateFunc = newUpdateFunc;
+void EnBird_SetupAction(EnBird* this, ActorFunc actionFunc) {
+    this->actionFunc = actionFunc;
 }

 void EnBird_Init(EnBird* this, GlobalContext* globalCtx) {
@ -91,7 +70,7 @@ void func_809C1CAC(EnBird* this, s16 params) {

    this->unk_198 = Math_Rand_S16Offset(5, 0x23);
    SkelAnime_ChangeAnim(&this->skelAnime, anim, playbackSpeed, 0.0f, frameCount, 0, 0.0f);
-    EnBird_SetNewUpdate(this, func_809C1D60);
+    EnBird_SetupAction(this, func_809C1D60);
 }

 void func_809C1D60(EnBird* this, GlobalContext* globalCtx) {
@ -114,7 +93,7 @@ void func_809C1D60(EnBird* this, GlobalContext* globalCtx) {

 void func_809C1E00(EnBird* this, s16 params) {
    this->unk_198 = Math_Rand_S16Offset(0x14, 0x2D);
-    EnBird_SetNewUpdate(this, (ActorFunc)func_809C1E40);
+    EnBird_SetupAction(this, (ActorFunc)func_809C1E40);
 }

 void func_809C1E40(EnBird* this, GlobalContext* globalCtx) {
@ -140,7 +119,7 @@ void func_809C1E40(EnBird* this, GlobalContext* globalCtx) {

 void EnBird_Update(EnBird* this, GlobalContext* globalCtx) {
    this->unk_1B4 += this->unk_1B8;
-    this->updateFunc(this, globalCtx);
+    this->actionFunc(this, globalCtx);
 }

 void EnBird_Draw(EnBird* this, GlobalContext* globalCtx) {
--- a/src/overlays/actors/ovl_En_Bird/z_en_bird.h
+++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.h
@ -0,0 +1,29 @@
+#ifndef _Z_EN_BIRD_H_
+#define _Z_EN_BIRD_H_
+
+#include <ultra64.h>
+#include <global.h>
+
+typedef struct {
+    /* 0x0000 */ Actor actor;
+    /* 0x014C */ SkelAnime skelAnime;
+    /* 0x0190 */ ActorFunc actionFunc;
+    /* 0x0194 */ u32 unk_194;
+    /* 0x0198 */ s32 unk_198;
+    /* 0x019C */ s16 unk_19C;
+    /* 0x019E */ char unk_19E[0x2];
+    /* 0x01A0 */ f32 unk_1A0;
+    /* 0x01A4 */ f32 unk_1A4;
+    /* 0x01A8 */ f32 unk_1A8;
+    /* 0x01AC */ f32 unk_1AC;
+    /* 0x01B0 */ f32 unk_1B0;
+    /* 0x01B4 */ f32 unk_1B4;
+    /* 0x01B8 */ f32 unk_1B8;
+    /* 0x01BC */ f32 unk_1BC;
+    /* 0x01C0 */ s16 unk_1C0;
+    /* 0x01C2 */ char unk_1C2[0x1A];
+} EnBird; // size = 0x01DC
+
+extern const ActorInit En_Bird_InitVars;
+
+#endif
--- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c
+++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c
@ -4,13 +4,9 @@
 * Description: The organ that Ganondorf plays in the cutscene before the fight. Includes carpet and scenery as well.
 */

-#include <ultra64.h>
-#include <global.h>
+#include "z_en_ganon_organ.h"

-typedef struct {
-    /* 0x0000 */ Actor actor;
-    /* 0x014C */ char unk_14C[0x4];
-} EnGanonOrgan; // size = 0x0150
+#include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h"

 #define FLAGS 0x00000030

@ -31,14 +27,6 @@ const ActorInit En_Ganon_Organ_InitVars = {
    (ActorFunc)EnGanonOrgan_Draw,
 };

-// temp local struct to represent ganondorf, remove when we can reference other overlays
-typedef struct {
-    /* 0x0000 */ Actor actor;
-    /* 0x014C */ char unk_14C[0x5CC];
-    /* 0x0718 */ s16 organFadeTimer;
-    /* 0x071A */ char unk_71A[0x2];
-} BossGanon; // size = 0x071C
-
 extern D_80A2CCA8; // remove when data is decompiled
 extern D_80A2EAB0; // remove when data is decompiled

--- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h
+++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h
@ -0,0 +1,14 @@
+#ifndef _Z_EN_GANON_ORGAN_H_
+#define _Z_EN_GANON_ORGAN_H_
+
+#include <ultra64.h>
+#include <global.h>
+
+typedef struct {
+    /* 0x0000 */ Actor actor;
+    /* 0x014C */ char unk_14C[0x4];
+} EnGanonOrgan; // size = 0x0150
+
+extern const ActorInit En_Ganon_Organ_InitVars;
+
+#endif
--- a/src/overlays/actors/ovl_En_It/z_en_it.c
+++ b/src/overlays/actors/ovl_En_It/z_en_it.c
@ -38,21 +38,21 @@ void EnIt_Init(EnIt* this, GlobalContext* globalCtx) {
    EnIt* it = this;

    it->actor.params = 0x0D05;
-    Collider_InitCylinder(globalCtx, &it->cylinderCollider);
-    Collider_SetCylinder(globalCtx, &it->cylinderCollider, &it->actor, &cylinderInitData);
+    Collider_InitCylinder(globalCtx, &it->collider);
+    Collider_SetCylinder(globalCtx, &it->collider, &it->actor, &cylinderInitData);
    func_80061EFC(&it->actor.colChkInfo, 0, &colChkInfoInit); // Init Damage Chart
 }

 void EnIt_Destroy(EnIt* this, GlobalContext* globalCtx) {
    EnIt* it = this;

-    Collider_DestroyCylinder(globalCtx, &it->cylinderCollider);
+    Collider_DestroyCylinder(globalCtx, &it->collider);
 }

 void EnIt_Update(EnIt* this, GlobalContext* globalCtx) {
    s32 pad;
    EnIt* it = this;

-    Collider_CylinderUpdate(&it->actor, &it->cylinderCollider);
-    CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &it->cylinderCollider);
+    Collider_CylinderUpdate(&it->actor, &it->collider);
+    CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &it->collider);
 }
--- a/src/overlays/actors/ovl_En_It/z_en_it.h
+++ b/src/overlays/actors/ovl_En_It/z_en_it.h
@ -7,7 +7,7 @@
 typedef struct {
    /* 0x0000 */ Actor actor;
    /* 0x014C */ u32 unk_14C;
-    /* 0x0150 */ ColliderCylinder cylinderCollider;
+    /* 0x0150 */ ColliderCylinder collider;
 } EnIt; // size = 0x019C

 extern const ActorInit En_It_InitVars;
--- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c
+++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c
@ -40,23 +40,23 @@ void EnMFire1_Init(EnMFire1* this, GlobalContext* globalCtx) {
        Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &thisLocal->actor, ACTORTYPE_ITEMACTION);
    }

-    Collider_InitCylinder(globalCtx, &thisLocal->capsule);
-    Collider_SetCylinder(globalCtx, &thisLocal->capsule, &thisLocal->actor, &cylinderInitData);
+    Collider_InitCylinder(globalCtx, &thisLocal->collider);
+    Collider_SetCylinder(globalCtx, &thisLocal->collider, &thisLocal->actor, &cylinderInitData);
 }

 void EnMFire1_Destroy(EnMFire1* this, GlobalContext* globalCtx) {
-    ColliderCylinder* capsule = &this->capsule;
-    Collider_DestroyCylinder(globalCtx, capsule);
+    ColliderCylinder* collider = &this->collider;
+    Collider_DestroyCylinder(globalCtx, collider);
 }

 void EnMFire1_Update(EnMFire1* this, GlobalContext* globalCtx) {
    s32 pad;
    EnMFire1* thisLocal = this;

-    if (Math_ApproxF(&thisLocal->unk_0198, 1.0, 0.2)) {
+    if (Math_ApproxF(&thisLocal->unk_198, 1.0f, 0.2f)) {
        Actor_Kill(&this->actor);
    } else {
-        Collider_CylinderUpdate(&thisLocal->actor, &thisLocal->capsule);
-        CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &thisLocal->capsule);
+        Collider_CylinderUpdate(&thisLocal->actor, &thisLocal->collider);
+        CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &thisLocal->collider);
    }
 }
--- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h
+++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h
@ -6,8 +6,8 @@

 typedef struct {
    /* 0x0000 */ Actor actor;
-    /* 0x014C */ ColliderCylinder capsule;
-    /* 0x0198 */ f32 unk_0198;
+    /* 0x014C */ ColliderCylinder collider;
+    /* 0x0198 */ f32 unk_198;
 } EnMFire1; // size = 0x019C

 extern const ActorInit En_M_Fire1_InitVars;
--- a/src/overlays/actors/ovl_En_OE2/z_en_oe2.c
+++ b/src/overlays/actors/ovl_En_OE2/z_en_oe2.c
@ -28,7 +28,7 @@ const ActorInit En_OE2_InitVars = {
 };

 void EnOE2_SetupAction(EnOE2* this, ActorFunc actionFunc) {
-    this->updateFunc = actionFunc;
+    this->actionFunc = actionFunc;
 }

 void EnOE2_Init(EnOE2* this, GlobalContext* globalCtx) {
--- a/src/overlays/actors/ovl_En_OE2/z_en_oe2.h
+++ b/src/overlays/actors/ovl_En_OE2/z_en_oe2.h
@ -7,7 +7,7 @@
 typedef struct {
    /* 0x0000 */ Actor actor;
    /* 0x014C */ char unk_14C[0x44];
-    /* 0x0190 */ ActorFunc updateFunc;
+    /* 0x0190 */ ActorFunc actionFunc;
 } EnOE2; // size = 0x0194

 extern const ActorInit En_OE2_InitVars;
--- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c
+++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c
@ -4,20 +4,13 @@
 * Description: Manages the storm created when playing Song of Storms
 */

-#include <ultra64.h>
-#include <global.h>
+#include "z_en_okarina_effect.h"

 #include <vt.h>

-typedef struct {
-    /* 0x0000 */ Actor actor;
-    /* 0x014C */ u16 timer;
-    /* 0x0150 */ ActorFunc actionFunc;
-} EnOkarinaEffect; // size = 0x0154
-
 #define FLAGS 0x02000010

-void EnOkarinaEffect_SetupAction(EnOkarinaEffect* this, ActorFunc* newActionFunc);
+void EnOkarinaEffect_SetupAction(EnOkarinaEffect* this, ActorFunc* actionFunc);
 void EnOkarinaEffect_Init(EnOkarinaEffect* this, GlobalContext* globalCtx);
 void EnOkarinaEffect_Destroy(EnOkarinaEffect* this, GlobalContext* globalCtx);
 void EnOkarinaEffect_TriggerStorm(EnOkarinaEffect* this, GlobalContext* globalCtx);
@ -36,8 +29,8 @@ const ActorInit En_Okarina_Effect_InitVars = {
    NULL,
 };

-void EnOkarinaEffect_SetupAction(EnOkarinaEffect* this, ActorFunc* newActionFunc) {
-    this->actionFunc = newActionFunc;
+void EnOkarinaEffect_SetupAction(EnOkarinaEffect* this, ActorFunc* actionFunc) {
+    this->actionFunc = actionFunc;
 }

 void EnOkarinaEffect_Destroy(EnOkarinaEffect* this, GlobalContext* globalCtx) {
--- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h
+++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h
@ -0,0 +1,15 @@
+#ifndef _Z_EN_OKARINA_EFFECT_H_
+#define _Z_EN_OKARINA_EFFECT_H_
+
+#include <ultra64.h>
+#include <global.h>
+
+typedef struct {
+    /* 0x0000 */ Actor actor;
+    /* 0x014C */ u16 timer;
+    /* 0x0150 */ ActorFunc actionFunc;
+} EnOkarinaEffect; // size = 0x0154
+
+extern const ActorInit En_Okarina_Effect_InitVars;
+
+#endif
--- a/src/overlays/actors/ovl_En_Part/z_en_part.h
+++ b/src/overlays/actors/ovl_En_Part/z_en_part.h
@ -5,8 +5,12 @@
 #include <global.h>

 typedef struct {
-    /* 0x0000 */ Actor actor;
-    /* 0x014C */ char unk_14C[0x10];
+    /* 0x000 */ Actor actor;
+    /* 0x14C */ u8 unk_14C;
+    /* 0x14E */ s16 unk_14E;
+    /* 0x150 */ s32 unk_150;
+    /* 0x154 */ f32 unk_154;
+    /* 0x158 */ f32 unk_158;
 } EnPart; // size = 0x015C

 extern const ActorInit En_Part_InitVars;
--- a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c
+++ b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c
@ -4,13 +4,7 @@
 * Description: Unknown (Broken Actor)
 */

-#include <ultra64.h>
-#include <global.h>
-
-typedef struct {
-    /* 0x0000 */ Actor actor;
-    /* 0x014C */ ActorFunc updateFunc;
-} EnSceneChange; // size = 0x0150
+#include "z_en_scene_change.h"

 #define FLAGS 0x00000000

@ -18,7 +12,7 @@ void EnSceneChange_Init(EnSceneChange* this, GlobalContext* globalCtx);
 void EnSceneChange_Destroy(EnSceneChange* this, GlobalContext* globalCtx);
 void EnSceneChange_Update(EnSceneChange* this, GlobalContext* globalCtx);
 void EnSceneChange_Draw(EnSceneChange* this, GlobalContext* globalCtx);
-void func_80AF8C70(EnSceneChange* this, ActorFunc updateFunc);
+void EnSceneChange_SetupAction(EnSceneChange* this, ActorFunc actionFunc);
 void func_80AF8CAC(EnSceneChange* this, GlobalContext* globalCtx);

 const ActorInit En_Scene_Change_InitVars = {
@ -33,12 +27,12 @@ const ActorInit En_Scene_Change_InitVars = {
    (ActorFunc)EnSceneChange_Draw,
 };

-void func_80AF8C70(EnSceneChange* this, ActorFunc updateFunc) {
-    this->updateFunc = updateFunc;
+void EnSceneChange_SetupAction(EnSceneChange* this, ActorFunc actionFunc) {
+    this->actionFunc = actionFunc;
 }

 void EnSceneChange_Init(EnSceneChange* this, GlobalContext* globalCtx) {
-    func_80AF8C70(this, func_80AF8CAC);
+    EnSceneChange_SetupAction(this, func_80AF8CAC);
 }

 void EnSceneChange_Destroy(EnSceneChange* this, GlobalContext* globalCtx) {
@ -48,7 +42,7 @@ void func_80AF8CAC(EnSceneChange* this, GlobalContext* globalCtx) {
 }

 void EnSceneChange_Update(EnSceneChange* this, GlobalContext* globalCtx) {
-    this->updateFunc(&this->actor, globalCtx);
+    this->actionFunc(this, globalCtx);
 }

 void EnSceneChange_Draw(EnSceneChange* this, GlobalContext* globalCtx) {
--- a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h
+++ b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h
@ -0,0 +1,14 @@
+#ifndef _Z_ITEM_SCENE_CHANGE_H_
+#define _Z_ITEM_SCENE_CHANGE_H_
+
+#include <ultra64.h>
+#include <global.h>
+
+typedef struct {
+    /* 0x0000 */ Actor actor;
+    /* 0x014C */ ActorFunc actionFunc;
+} EnSceneChange; // size = 0x0150
+
+extern const ActorInit En_Scene_Change_InitVars;
+
+#endif
--- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
+++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
@ -95,8 +95,8 @@ void EnWallmas_Init(EnWallmas* this, GlobalContext* globalCtx) {
    SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06008FB0, &D_06009DB0, &this->unkSkelAnimeStruct, &this->unk_22e,
                     0x19);

-    Collider_InitCylinder(globalCtx, &this->colCylinder);
-    Collider_SetCylinder(globalCtx, &this->colCylinder, &this->actor, &colCylinderInit);
+    Collider_InitCylinder(globalCtx, &this->collider);
+    Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &colCylinderInit);
    func_80061ED4(&this->actor.colChkInfo, &damageTable, &colChkInfoInit);
    this2->switchFlag = (u8)(this2->actor.params >> 0x8);
    this->actor.params = this->actor.params & 0xFF;
@ -116,7 +116,7 @@ void EnWallmas_Init(EnWallmas* this, GlobalContext* globalCtx) {
 }

 void EnWallmas_Destroy(EnWallmas* this, GlobalContext* globalCtx) {
-    ColliderCylinder* col = &this->colCylinder;
+    ColliderCylinder* col = &this->collider;
    Collider_DestroyCylinder(globalCtx, col);
 }

@ -192,10 +192,10 @@ void EnWallmas_ReturnToCeilingStart(EnWallmas* this) {

 void EnWallmas_TakeDamageStart(EnWallmas* this) {
    SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_06000590, -3.0f);
-    if ((this->colCylinder.body.acHitItem->toucher.flags & 0x1F824) != 0) {
-        this->actor.posRot.rot.y = this->colCylinder.base.ac->posRot.rot.y;
+    if ((this->collider.body.acHitItem->toucher.flags & 0x1F824) != 0) {
+        this->actor.posRot.rot.y = this->collider.base.ac->posRot.rot.y;
    } else {
-        this->actor.posRot.rot.y = func_8002DA78(&this->actor, this->colCylinder.base.ac) + 0x8000;
+        this->actor.posRot.rot.y = func_8002DA78(&this->actor, this->collider.base.ac) + 0x8000;
    }

    func_8003426C(&this->actor, 0x4000, 0xFF, 0, 0x14);
@ -476,9 +476,9 @@ void EnWallmas_Stun(EnWallmas* this, GlobalContext* globalCtx) {
 }

 void EnWallmas_ColUpdate(EnWallmas* this, GlobalContext* globalCtx) {
-    if ((this->colCylinder.base.acFlags & 2) != 0) {
-        this->colCylinder.base.acFlags &= ~2;
-        func_80035650(&this->actor, &this->colCylinder.body, 1);
+    if ((this->collider.base.acFlags & 2) != 0) {
+        this->collider.base.acFlags &= ~2;
+        func_80035650(&this->actor, &this->collider.body, 1);
        if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) {
            if (Actor_ApplyDamage(&this->actor) == 0) {
                func_80032C7C(globalCtx, &this->actor);
@ -511,7 +511,7 @@ void EnWallmas_Update(EnWallmas* this, GlobalContext* globalCtx) {
    char pad[4];

    EnWallmas_ColUpdate(this2, globalCtx);
-    this2->actionFunc(&this->actor, globalCtx);
+    this2->actionFunc(this, globalCtx);

    if ((this2->actionFunc == (ActorFunc)&EnWallmas_WaitToDrop) ||
        (this2->actionFunc == (ActorFunc)&EnWallmas_WaitForProximity) ||
@ -534,12 +534,12 @@ void EnWallmas_Update(EnWallmas* this, GlobalContext* globalCtx) {
    }

    if ((this2->actionFunc != (ActorFunc)&EnWallmas_Die) && (this2->actionFunc != (ActorFunc)&EnWallmas_Drop)) {
-        Collider_CylinderUpdate(&this2->actor, &this2->colCylinder);
-        CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this2->colCylinder);
+        Collider_CylinderUpdate(&this2->actor, &this2->collider);
+        CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this2->collider);

        if ((this2->actionFunc != (ActorFunc)&EnWallmas_TakeDamage) && (this2->actor.bgCheckFlags & 1) != 0 &&
            (this2->actor.freeze == 0)) {
-            CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this2->colCylinder);
+            CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this2->collider);
        }
    }

--- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
+++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
@ -21,7 +21,7 @@ typedef struct {
    /* 0x022E */ u16 unk_22e;
    /* 0x0230 */ char unk_230[0x94];
    /* 0x02C4 */ f32 unk_2c4;
-    /* 0x02C8 */ ColliderCylinder colCylinder;
+    /* 0x02C8 */ ColliderCylinder collider;
 } EnWallmas; // size = 0x0314

 extern const ActorInit En_Wallmas_InitVars;
--- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c
+++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c
@ -27,7 +27,7 @@ const ActorInit Item_Inbox_InitVars = {
 };

 void ItemInbox_Init(ItemInbox* this, GlobalContext* globalCtx) {
-    this->updateFunc = func_80B86020;
+    this->actionFunc = func_80B86020;
    Actor_SetScale(&this->actor, 0.2);
 }

@ -41,7 +41,7 @@ void func_80B86020(ItemInbox* this, GlobalContext* globalCtx) {
 }

 void ItemInbox_Update(ItemInbox* this, GlobalContext* globalCtx) {
-    this->updateFunc(this, globalCtx);
+    this->actionFunc(this, globalCtx);
 }

 void ItemInbox_Draw(ItemInbox* this, GlobalContext* globalCtx) {
--- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h
+++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h
@ -6,8 +6,8 @@

 typedef struct {
    /* 0x0000 */ Actor actor;
-    /* 0x014C */ ActorFunc updateFunc;
-} ItemInbox; // size = 0x0154
+    /* 0x014C */ ActorFunc actionFunc;
+} ItemInbox; // size = 0x0150

 extern const ActorInit Item_Inbox_InitVars;

--- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
+++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
@ -176,7 +176,7 @@ void ObjComb_Wait(ObjComb* this, GlobalContext* globalCtx) {

 void ObjComb_Update(ObjComb* this, GlobalContext* globalCtx) {
    this->unk_1B2 += 12000;
-    this->actionFunc(&this->actor, globalCtx);
+    this->actionFunc(this, globalCtx);
    this->actor.shape.rot.x = Math_Sins(this->unk_1B2) * this->unk_1B0 + this->actor.initPosRot.rot.x;
 }

--- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
+++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
@ -61,5 +61,5 @@ void func_80B983D4(ObjMakekinsuta* this, GlobalContext* globalCtx) {
 }

 void ObjMakekinsuta_Update(ObjMakekinsuta* this, GlobalContext* globalCtx) {
-    this->actionFunc(&this->actor, globalCtx);
+    this->actionFunc(this, globalCtx);
 }
--- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c
+++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c
@ -41,7 +41,7 @@ void ObjRoomtimer_Init(ObjRoomtimer* this, GlobalContext* globalCtx) {
        }
    }

-    this->updateFunc = (ActorFunc)func_80B9D054;
+    this->actionFunc = (ActorFunc)func_80B9D054;
 }

 void ObjRoomtimer_Destroy(ObjRoomtimer* this, GlobalContext* globalCtx) {
@ -58,7 +58,7 @@ void func_80B9D054(ObjRoomtimer* this, GlobalContext* globalCtx) {
    }

    Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORTYPE_PROP);
-    this->updateFunc = (ActorFunc)func_80B9D0B0;
+    this->actionFunc = (ActorFunc)func_80B9D0B0;
 }

 void func_80B9D0B0(ObjRoomtimer* this, GlobalContext* globalCtx) {
@ -83,5 +83,5 @@ void func_80B9D0B0(ObjRoomtimer* this, GlobalContext* globalCtx) {
 }

 void ObjRoomtimer_Update(ObjRoomtimer* this, GlobalContext* globalCtx) {
-    this->updateFunc(this, globalCtx);
+    this->actionFunc(this, globalCtx);
 }
--- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h
+++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h
@ -7,7 +7,7 @@

 typedef struct {
    /* 0x0000 */ Actor actor;
-    /* 0x014C */ ActorFunc updateFunc;
+    /* 0x014C */ ActorFunc actionFunc;
    /* 0x0150 */ u32 switchFlag;
 } ObjRoomtimer; // size = 0x0154