diff --git a/assets/xml/objects/object_dkjail_obj.xml b/assets/xml/objects/object_dkjail_obj.xml
index d0d2775c3a..0827c38142 100644
--- a/assets/xml/objects/object_dkjail_obj.xml
+++ b/assets/xml/objects/object_dkjail_obj.xml
@@ -1,9 +1,10 @@
+
-
-
-
-
+
+
+
+
diff --git a/assets/xml/objects/object_dor02.xml b/assets/xml/objects/object_dor02.xml
index 3cc3d14115..402fdd4990 100644
--- a/assets/xml/objects/object_dor02.xml
+++ b/assets/xml/objects/object_dor02.xml
@@ -1,6 +1,7 @@
+
-
+
diff --git a/assets/xml/objects/object_dor04.xml b/assets/xml/objects/object_dor04.xml
index 4e78d9efe2..afb348c7d0 100644
--- a/assets/xml/objects/object_dor04.xml
+++ b/assets/xml/objects/object_dor04.xml
@@ -1,6 +1,7 @@
+
-
+
diff --git a/assets/xml/objects/object_gm.xml b/assets/xml/objects/object_gm.xml
index 50c852ade8..80edb8aebd 100644
--- a/assets/xml/objects/object_gm.xml
+++ b/assets/xml/objects/object_gm.xml
@@ -1,6 +1,6 @@
+
-
-
+
diff --git a/assets/xml/objects/object_sekihig.xml b/assets/xml/objects/object_sekihig.xml
index bb995bed48..de104df55d 100644
--- a/assets/xml/objects/object_sekihig.xml
+++ b/assets/xml/objects/object_sekihig.xml
@@ -1,16 +1,19 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_sekihil.xml b/assets/xml/objects/object_sekihil.xml
index fb9903875f..3dbb57774f 100644
--- a/assets/xml/objects/object_sekihil.xml
+++ b/assets/xml/objects/object_sekihil.xml
@@ -1,16 +1,19 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_sekihin.xml b/assets/xml/objects/object_sekihin.xml
index 104f5f1333..300a9ad58b 100644
--- a/assets/xml/objects/object_sekihin.xml
+++ b/assets/xml/objects/object_sekihin.xml
@@ -1,17 +1,19 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_sekihiz.xml b/assets/xml/objects/object_sekihiz.xml
index 9563d8b420..806279c982 100644
--- a/assets/xml/objects/object_sekihiz.xml
+++ b/assets/xml/objects/object_sekihiz.xml
@@ -1,9 +1,10 @@
+
-
-
-
-
-
+
+
+
+
+
diff --git a/assets/xml/objects/object_tanron1.xml b/assets/xml/objects/object_tanron1.xml
index 99a39e534c..d5ec3be030 100644
--- a/assets/xml/objects/object_tanron1.xml
+++ b/assets/xml/objects/object_tanron1.xml
@@ -1,6 +1,6 @@
+
-
-
+
diff --git a/assets/xml/objects/object_tanron4.xml b/assets/xml/objects/object_tanron4.xml
index 491e9a587c..ea342d448a 100644
--- a/assets/xml/objects/object_tanron4.xml
+++ b/assets/xml/objects/object_tanron4.xml
@@ -1,30 +1,30 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/assets/xml/objects/object_zog.xml b/assets/xml/objects/object_zog.xml
index 8d9e6ebdb9..b6d9d26ed3 100644
--- a/assets/xml/objects/object_zog.xml
+++ b/assets/xml/objects/object_zog.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c
index 70bc5931f7..344fcce84d 100644
--- a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c
+++ b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c
@@ -123,7 +123,7 @@ void BgDkjailIvy_Init(Actor* thisx, PlayState* play) {
if (Flags_GetSwitch(play, BG_DKJAIL_GET_SWITCH(thisx))) {
Actor_Kill(&this->dyna.actor);
} else {
- DynaPolyActor_LoadMesh(play, &this->dyna, &object_dkjail_obj_Colheader_0011A8);
+ DynaPolyActor_LoadMesh(play, &this->dyna, &gDkjailCol);
Collider_SetCylinder(play, &this->collider, &this->dyna.actor, &sCylinderInit);
Collider_UpdateCylinder(&this->dyna.actor, &this->collider);
this->alpha = 255;
diff --git a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c
index b6717aac04..e26c1769ed 100644
--- a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c
+++ b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c
@@ -39,40 +39,44 @@ ActorInit En_Sekihi_InitVars = {
static s16 sObjectIds[] = { OBJECT_SEKIHIL, OBJECT_SEKIHIG, OBJECT_SEKIHIN, OBJECT_SEKIHIZ, OBJECT_ZOG };
static Gfx* sOpaDLists[] = {
- gGraveTriforceSymbolDL, gGraveGoronSymbolDL, gGraveKokiriSymbolDL, gTombSongOfSoaringDL, gMikauGraveDL,
+ gSunsSongGraveTriforceDL, gSunsSongGraveGoronDL, gSunsSongGraveKokiriDL, gSongOfSoaringPedestalDL, gMikauGraveDL,
};
static Gfx* sXluDLists[] = {
- gSunSongTriforceSymbolDL, gSunSongGoronSymbolDL, gSunSongKokiriSymbolDL, gSekihizEmptyDL, gMikauGraveDirtDL,
+ gSunsSongGraveTriforceSymbolsDL,
+ gSunsSongGraveGoronSymbolsDL,
+ gSunsSongGraveKokiriSymbolsDL,
+ gSongOfSoaringPedestalEmptyDL,
+ gMikauGraveDirtDL,
};
static u16 sTextIds[] = { 0, 0, 0, 0, 0x1018 };
void EnSekihi_Init(Actor* thisx, PlayState* play) {
EnSekihi* this = THIS;
- s32 params = ENSIKIHI_GET_TYPE(thisx);
+ s32 type = ENSIKIHI_GET_TYPE(thisx);
s32 objectIndex;
s32 pad;
- if ((params < SEKIHI_TYPE_0 || params >= SEKIHI_TYPE_MAX) || sOpaDLists[params] == NULL) {
+ if (((type < SEKIHI_TYPE_0) || (type >= SEKIHI_TYPE_MAX)) || (sOpaDLists[type] == NULL)) {
Actor_Kill(&this->dyna.actor);
return;
}
- if ((params == SEKIHI_TYPE_4) &&
+ if ((type == SEKIHI_TYPE_4) &&
((gSaveContext.save.saveInfo.skullTokenCount & 0xFFFF) >= SPIDER_HOUSE_TOKENS_REQUIRED)) {
// For some reason the mikau grave sets the flag instead of something in the spider house on exit.
SET_WEEKEVENTREG(WEEKEVENTREG_OCEANSIDE_SPIDER_HOUSE_BUYER_MOVED_IN);
}
- objectIndex = Object_GetIndex(&play->objectCtx, sObjectIds[params]);
+ objectIndex = Object_GetIndex(&play->objectCtx, sObjectIds[type]);
if (objectIndex >= 0) {
this->objectIndex = objectIndex;
}
this->actionFunc = func_80A44DE8;
- this->opaDList = sOpaDLists[params];
- this->xluDList = sXluDLists[params];
- this->dyna.actor.textId = sTextIds[params];
+ this->opaDList = sOpaDLists[type];
+ this->xluDList = sXluDLists[type];
+ this->dyna.actor.textId = sTextIds[type];
this->dyna.actor.focus.pos.y = this->dyna.actor.world.pos.y + 60.0f;
Actor_SetScale(&this->dyna.actor, 0.1f);
}
@@ -85,16 +89,17 @@ void EnSekihi_Destroy(Actor* thisx, PlayState* play) {
void func_80A44DE8(EnSekihi* this, PlayState* play) {
CollisionHeader* colHeader = NULL;
- s32 params;
+ s32 type;
CollisionHeader* colHeaders[] = {
- &gSekihilCol, &gSekihigCol, &gSekihinCol, &gSekihizCol, &gObjectZogCol,
+ &gSunsSongGraveTriforceCol, &gSunsSongGraveGoronCol, &gSunsSongGraveKokiriCol,
+ &gSongOfSoaringPedestalCol, &gMikauGraveCol,
};
- params = ENSIKIHI_GET_TYPE(&this->dyna.actor);
+ type = ENSIKIHI_GET_TYPE(&this->dyna.actor);
if (Object_IsLoaded(&play->objectCtx, this->objectIndex)) {
this->dyna.actor.objBankIndex = this->objectIndex;
this->dyna.actor.draw = EnSekihi_Draw;
- if (params == SEKIHI_TYPE_4) {
+ if (type == SEKIHI_TYPE_4) {
this->actionFunc = func_80A450B0;
} else {
this->actionFunc = EnSekihi_DoNothing;
@@ -102,12 +107,12 @@ void func_80A44DE8(EnSekihi* this, PlayState* play) {
Actor_SetObjectDependency(play, &this->dyna.actor);
DynaPolyActor_Init(&this->dyna, 0);
- if (colHeaders[params] != NULL) {
- CollisionHeader_GetVirtual(colHeaders[params], &colHeader);
+ if (colHeaders[type] != NULL) {
+ CollisionHeader_GetVirtual(colHeaders[type], &colHeader);
}
this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader);
- if ((params == SEKIHI_TYPE_4) && (INV_CONTENT(ITEM_MASK_ZORA) != ITEM_MASK_ZORA)) {
+ if ((type == SEKIHI_TYPE_4) && (INV_CONTENT(ITEM_MASK_ZORA) != ITEM_MASK_ZORA)) {
Actor_Kill(&this->dyna.actor);
}
}
diff --git a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c
index 074eaec797..8ea4716038 100644
--- a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c
+++ b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c
@@ -48,7 +48,7 @@ void EnTanron4_Init(Actor* thisx, PlayState* play2) {
EnTanron4* this = THIS;
SkelAnime_InitFlex(play, &this->skelAnime, &gSeagullSkel, &gSeagullFlapAnim, this->jointTable, this->morphTable,
- OBJECT_TANRON4_LIMB_MAX);
+ SEAGULL_LIMB_RIGHT_WING_MAX);
thisx->flags &= ~ACTOR_FLAG_1;
thisx->speed = 3.0f + KREG(48);
diff --git a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h
index 36a48c91a6..93183dda9c 100644
--- a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h
+++ b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h
@@ -19,8 +19,8 @@ typedef struct EnTanron4 {
/* 0x15C */ s16 rollTarget;
/* 0x160 */ f32 timeInfluence;
/* 0x164 */ SkelAnime skelAnime;
- /* 0x1A8 */ Vec3s jointTable[OBJECT_TANRON4_LIMB_MAX];
- /* 0x1EA */ Vec3s morphTable[OBJECT_TANRON4_LIMB_MAX];
+ /* 0x1A8 */ Vec3s jointTable[SEAGULL_LIMB_RIGHT_WING_MAX];
+ /* 0x1EA */ Vec3s morphTable[SEAGULL_LIMB_RIGHT_WING_MAX];
/* 0x022C */ EnTanron4ActionFunc actionFunc;
} EnTanron4; // size = 0x230