mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup symbols from undefined_syms.txt (2nd round) (#934)

Browse source
This commit is contained in:
Dragorn421 2021-09-01 01:00:55 +02:00 • committed by GitHub
parent 4444c5ea35
commit 89634377c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 162 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
View file

@ -4,6 +4,7 @@
#include "objects/object_ganon/object_ganon.h"
#include "objects/object_ganon2/object_ganon2.h"
#include "objects/object_ganon_anime3/object_ganon_anime3.h"
#include "objects/object_geff/object_geff.h"
#define FLAGS 0x00000035
@ -32,18 +33,6 @@ void func_809060E8(GlobalContext* globalCtx);
void BossGanon2_GenShadowTexture(void* shadowTexture, BossGanon2* this, GlobalContext* globalCtx);
void BossGanon2_DrawShadowTexture(void* shadowTexture, BossGanon2* this, GlobalContext* globalCtx);
// object_geff
extern Gfx D_06000EA0[];
// object_ganon?
extern UNK_TYPE D_0600A8E0;
// ?
extern AnimationHeader D_060147E0;
// object_ganon2
extern u64 D_06021A90[]; // title card
const ActorInit Boss_Ganon2_InitVars = {
ACTOR_BOSS_GANON2,
ACTORCAT_BOSS,
@ -88,13 +77,13 @@ void func_808FD080(s32 idx, ColliderJntSph* collider, Vec3f* arg2) {
collider->elements[idx].dim.modelSphere.radius * collider->elements[idx].dim.scale;
}
void BossGanon2_SetObjectSegment(BossGanon2* this, GlobalContext* globalCtx, s32 objectId, u8 arg3) {
void BossGanon2_SetObjectSegment(BossGanon2* this, GlobalContext* globalCtx, s32 objectId, u8 setRSPSegment) {
s32 pad;
s32 objectIdx = Object_GetIndex(&globalCtx->objectCtx, objectId);
gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[objectIdx].segment);
if (arg3) {
if (setRSPSegment) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 790);
gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[objectIdx].segment);
@ -674,7 +663,7 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) {
}
if (this->unk_398 == 80) {
BossGanon2_SetObjectSegment(this, globalCtx, OBJECT_GANON2, false);
TitleCard_InitBossName(globalCtx, &globalCtx->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(D_06021A90), 160,
TitleCard_InitBossName(globalCtx, &globalCtx->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(object_ganon2_Tex_021A90), 160,
180, 128, 40);
}
this->unk_3A4.x = ((this->actor.world.pos.x + 500.0f) - 350.0f) + 100.0f;
@ -837,8 +826,8 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) {
if ((this->unk_398 > 40) && (func_8010BDBC(&globalCtx->msgCtx) == 0)) {
this->unk_39C = 29;
this->unk_398 = 0;
Animation_MorphToPlayOnce(&this->skelAnime, &D_060147E0, 0.0f);
this->unk_194 = Animation_GetLastFrame(&D_060147E0);
Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime3_Anim_0147E0, 0.0f);
this->unk_194 = Animation_GetLastFrame(&object_ganon_anime3_Anim_0147E0);
this->actor.shape.yOffset = 0.0f;
this->actor.world.pos.y = 1086.0f;
this->actor.gravity = -1.0f;
@ -2737,8 +2726,8 @@ void BossGanon2_Draw(Actor* thisx, GlobalContext* globalCtx) {
switch (this->unk_337) {
case 0:
BossGanon2_SetObjectSegment(this, globalCtx, OBJECT_GANON, true);
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&D_0600A8E0));
gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&D_0600A8E0));
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(object_ganon_Tex_00A8E0));
gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(object_ganon_Tex_00A8E0));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable,
this->skelAnime.dListCount, NULL, BossGanon2_PostLimbDraw2, this);
break;
@ -2865,12 +2854,11 @@ void func_80905DA8(BossGanon2* this, GlobalContext* globalCtx) {
void func_809060E8(GlobalContext* globalCtx) {
s16 alpha;
u8 spCD;
u8 usingObjectGEff = false;
BossGanon2Effect* effect;
s16 i;
BossGanon2Effect* effects;
spCD = 0;
effects = effect = globalCtx->specialEffects;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 6086);
@ -2919,9 +2907,9 @@ void func_809060E8(GlobalContext* globalCtx) {
for (i = 0; i < ARRAY_COUNT(sParticles); i++, effect++) {
if (effect->type == 2) {
if (spCD == 0) {
if (!usingObjectGEff) {
BossGanon2_SetObjectSegment(NULL, globalCtx, OBJECT_GEFF, true);
spCD++;
usingObjectGEff++;
}
Matrix_Translate(effect->position.x, effect->position.y, effect->position.z, MTXMODE_NEW);
Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
@ -2930,7 +2918,7 @@ void func_809060E8(GlobalContext* globalCtx) {
Matrix_RotateZ(effect->unk_38.x, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 6179),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06000EA0);
gSPDisplayList(POLY_OPA_DISP++, gGanonRubbleDL);
}
}

12
src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c
View file

@ -1,10 +1,6 @@
#include "z_boss_ganon2.h"
#include "overlays/actors/ovl_En_Zl3/z_en_zl3.h"
// object_ganon2
extern u64 D_0601E188[]; // eye open
extern u64 D_0601E988[]; // eye half closed
extern u64 D_0601EA08[]; // eye closed
#include "objects/object_ganon2/object_ganon2.h"
typedef struct {
/* 0x00 */ u8 type;
@ -311,9 +307,9 @@ static s8 D_80907144[] = {
static Vec3f D_80907164 = { 800.0f, 420.0f, 100.0f };
static void* sEyeTextures[] = {
D_0601E188,
D_0601E988,
D_0601EA08,
object_ganon2_Tex_01E188,
object_ganon2_Tex_01E988,
object_ganon2_Tex_01EA08,
};
static Vec3f D_8090717C = { 0.0f, -2000.0f, 0.0f };

2
src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
View file

@ -56,8 +56,6 @@ const ActorInit Demo_Geff_InitVars = {
(ActorFunc)DemoGeff_Draw,
};
extern Gfx gGanonRubbleDL[];
void DemoGeff_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}

61
src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
View file

@ -1,5 +1,6 @@
#include "z_demo_ik.h"
#include "vt.h"
#include "objects/object_ik/object_ik.h"
#define FLAGS 0x00000010
@ -24,26 +25,6 @@ void DemoIk_DrawNothing(DemoIk* this, GlobalContext* globalCtx);
void DemoIk_Type1Draw(DemoIk* this, GlobalContext* globalCtx);
void DemoIk_Type2Draw(DemoIk* this, GlobalContext* globalCtx);
extern AnimationHeader D_0600035C;
extern SkeletonHeader D_06000380;
extern AnimationHeader D_06000634;
extern SkeletonHeader D_06000660;
extern AnimationHeader D_060008DC;
extern AnimationHeader D_06000C6C;
extern SkeletonHeader D_06000C90;
extern AnimationHeader D_06000F0C;
extern Gfx D_06016BE0[];
extern Gfx D_06016CD8[];
extern Gfx D_06016F88[];
extern Gfx D_06017028[];
extern Gfx D_06017170[];
extern FlexSkeletonHeader D_0601EE60;
extern FlexSkeletonHeader D_06000F30;
extern AnimationHeader D_0601EB14;
extern FlexSkeletonHeader D_0601EB40;
extern AnimationHeader D_0601EE34;
extern FlexSkeletonHeader D_06000900;
void DemoIk_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
@ -183,18 +164,18 @@ void DemoIk_Type1Init(DemoIk* this, GlobalContext* globalCtx) {
switch (this->actor.params) {
case 0:
skeleton = &D_06000C90;
animation = &D_06000C6C;
skeleton = &object_ik_Skel_000C90;
animation = &object_ik_Anim_000C6C;
phi_f0 = 30.0f;
break;
case 1:
skeleton = &D_06000660;
animation = &D_06000634;
skeleton = &object_ik_Skel_000660;
animation = &object_ik_Anim_000634;
phi_f0 = 10.0f;
break;
default:
skeleton = &D_06000380;
animation = &D_0600035C;
skeleton = &object_ik_Skel_000380;
animation = &object_ik_Anim_00035C;
phi_f0 = 20.0f;
// No break is required for matching
}
@ -286,12 +267,12 @@ void DemoIk_Type1PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
case 0:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inArmer.c", 390),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016BE0);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0);
break;
case 2:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inArmer.c", 396),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016F88);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016F88);
break;
}
}
@ -321,20 +302,20 @@ void DemoIk_Type2Init(DemoIk* this, GlobalContext* globalCtx) {
switch (this->actor.params) {
case 3:
skeleton = &D_0601EB40;
animation = &D_0601EB14;
skeleton = &object_ik_Skel_01EB40;
animation = &object_ik_Anim_01EB14;
break;
case 4:
skeleton = &D_0601EE60;
animation = &D_0601EE34;
skeleton = &object_ik_Skel_01EE60;
animation = &object_ik_Anim_01EE34;
break;
case 5:
skeleton = &D_06000F30;
animation = &D_06000F0C;
skeleton = &object_ik_Skel_000F30;
animation = &object_ik_Anim_000F0C;
break;
default:
skeleton = &D_06000900;
animation = &D_060008DC;
skeleton = &object_ik_Skel_000900;
animation = &object_ik_Anim_0008DC;
}
SkelAnime_InitFlex(globalCtx, &this->skelAnime, skeleton, NULL, this->jointTable, this->morphTable, 2);
@ -444,22 +425,22 @@ void DemoIk_Type2PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
case 3:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inFace.c", 274),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06017028);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_017028);
break;
case 4:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inFace.c", 280),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06017170);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_017170);
break;
case 5:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inFace.c", 286),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016BE0);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0);
break;
default:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inFace.c", 292),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016CD8);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016CD8);
break;
}
}

9
src/overlays/actors/ovl_En_Guest/z_en_guest.c
View file

@ -6,6 +6,7 @@
#include "z_en_guest.h"
#include "objects/object_os_anime/object_os_anime.h"
#include "objects/object_boj/object_boj.h"
#include "vt.h"
#define FLAGS 0x00000019
@ -50,9 +51,7 @@ static InitChainEntry sInitChain[] = {
ICHAIN_F32(targetArrowOffset, 500, ICHAIN_STOP),
};
extern FlexSkeletonHeader D_060000F0;
extern AnimationHeader D_060042AC;
extern Gfx D_060059B0[];
extern FlexSkeletonHeader object_boj_Skel_0000F0;
void EnGuest_Init(Actor* thisx, GlobalContext* globalCtx) {
EnGuest* this = THIS;
@ -85,7 +84,7 @@ void EnGuest_Update(Actor* thisx, GlobalContext* globalCtx) {
this->actor.flags &= ~0x10;
Actor_ProcessInitChain(&this->actor, sInitChain);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060000F0, NULL, this->jointTable, this->morphTable, 16);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_boj_Skel_0000F0, NULL, this->jointTable, this->morphTable, 16);
gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->osAnimeBankIndex].segment);
Animation_Change(&this->skelAnime, &gObjOsAnim_42AC, 1.0f, 0.0f, Animation_GetLastFrame(&gObjOsAnim_42AC),
ANIMMODE_LOOP, 0.0f);
@ -193,7 +192,7 @@ s32 EnGuest_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_guest.c", 352);
if (limbIndex == 15) {
*dList = D_060059B0;
*dList = object_boj_DL_0059B0;
Matrix_Translate(1400.0f, 0.0f, 0.0f, MTXMODE_APPLY);
sp3C = this->unk_2A0.unk_08;
Matrix_RotateX((sp3C.y / 32768.0f) * M_PI, MTXMODE_APPLY);

125
src/overlays/actors/ovl_En_Ik/z_en_ik.c
View file

@ -6,6 +6,7 @@
#include "z_en_ik.h"
#include "scenes/dungeons/jyasinboss/jyasinboss_scene.h"
#include "objects/object_ik/object_ik.h"
#include "vt.h"
#define FLAGS 0x00000010
@ -53,32 +54,6 @@ void func_80A77EDC(EnIk* this, GlobalContext* globalCtx);
void func_80A78160(EnIk* this, GlobalContext* globalCtx);
void func_80A781CC(Actor* thisx, GlobalContext* globalCtx);
extern AnimationHeader D_06001C28;
extern AnimationHeader D_06002538;
extern AnimationHeader D_060029FC;
extern AnimationHeader D_060033C4;
extern AnimationHeader D_06003DBC;
extern AnimationHeader D_060045BC;
extern AnimationHeader D_0600485C;
extern AnimationHeader D_06005944;
extern AnimationHeader D_06006194;
extern AnimationHeader D_06006734;
extern AnimationHeader D_0600C114;
extern AnimationHeader D_0600CD70;
extern AnimationHeader D_0600DD50;
extern AnimationHeader D_0600ED24;
extern Gfx D_06016BE0[];
extern Gfx D_06016CD8[];
extern Gfx D_06016D88[];
extern Gfx D_06016EE8[];
extern Gfx D_06016F88[];
extern Gfx D_06018E78[];
extern Gfx D_06019100[];
extern Gfx D_06019E08[];
extern FlexSkeletonHeader D_0601E178;
extern AnimationHeader D_060203D8;
extern FlexSkeletonHeader D_060205C0;
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
@ -295,7 +270,7 @@ Actor* func_80A74674(GlobalContext* globalCtx, Actor* actor) {
}
void func_80A74714(EnIk* this) {
f32 frames = Animation_GetLastFrame(&D_0600CD70);
f32 frames = Animation_GetLastFrame(&object_ik_Anim_00CD70);
f32 frame;
if (this->actor.params >= 2) {
@ -304,7 +279,7 @@ void func_80A74714(EnIk* this) {
frame = 0.0f;
}
Animation_Change(&this->skelAnime, &D_0600CD70, 0.0f, frame, frames, ANIMMODE_ONCE, 0.0f);
Animation_Change(&this->skelAnime, &object_ik_Anim_00CD70, 0.0f, frame, frames, ANIMMODE_ONCE, 0.0f);
this->unk_2F8 = 3;
this->actor.speedXZ = 0.0f;
EnIk_SetupAction(this, func_80A747C0);
@ -331,12 +306,12 @@ void func_80A747C0(EnIk* this, GlobalContext* globalCtx) {
}
void func_80A7489C(EnIk* this) {
f32 frames = Animation_GetLastFrame(&D_0600DD50);
f32 frames = Animation_GetLastFrame(&object_ik_Anim_00DD50);
this->actor.flags |= 5;
this->unk_2F8 = 4;
this->actor.speedXZ = 0.0f;
Animation_Change(&this->skelAnime, &D_0600DD50, 0.0f, 0.0f, frames, ANIMMODE_LOOP, 4.0f);
Animation_Change(&this->skelAnime, &object_ik_Anim_00DD50, 0.0f, 0.0f, frames, ANIMMODE_LOOP, 4.0f);
EnIk_SetupAction(this, func_80A7492C);
}
@ -363,11 +338,11 @@ void func_80A7492C(EnIk* this, GlobalContext* globalCtx) {
void func_80A74AAC(EnIk* this) {
this->unk_2F8 = 5;
if (this->unk_2FB == 0) {
Animation_Change(&this->skelAnime, &D_0600ED24, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600ED24), ANIMMODE_LOOP,
Animation_Change(&this->skelAnime, &object_ik_Anim_00ED24, 1.0f, 0.0f, Animation_GetLastFrame(&object_ik_Anim_00ED24), ANIMMODE_LOOP,
-4.0f);
this->actor.speedXZ = 0.9f;
} else {
Animation_Change(&this->skelAnime, &D_06006734, 1.0f, 0.0f, Animation_GetLastFrame(&D_06006734), ANIMMODE_LOOP,
Animation_Change(&this->skelAnime, &object_ik_Anim_006734, 1.0f, 0.0f, Animation_GetLastFrame(&object_ik_Anim_006734), ANIMMODE_LOOP,
-4.0f);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_IRONNACK_DASH);
this->actor.speedXZ = 2.5f;
@ -435,12 +410,12 @@ void func_80A74BA4(EnIk* this, GlobalContext* globalCtx) {
}
void func_80A74E2C(EnIk* this) {
f32 frames = Animation_GetLastFrame(&D_06001C28);
f32 frames = Animation_GetLastFrame(&object_ik_Anim_001C28);
this->unk_2FF = 1;
this->unk_2F8 = 6;
this->actor.speedXZ = 0.0f;
Animation_Change(&this->skelAnime, &D_06001C28, 1.5f, 0.0f, frames, ANIMMODE_ONCE, -4.0f);
Animation_Change(&this->skelAnime, &object_ik_Anim_001C28, 1.5f, 0.0f, frames, ANIMMODE_ONCE, -4.0f);
EnIk_SetupAction(this, func_80A74EBC);
}
@ -475,13 +450,13 @@ void func_80A74EBC(EnIk* this, GlobalContext* globalCtx) {
}
void func_80A7506C(EnIk* this) {
f32 frames = Animation_GetLastFrame(&D_060029FC);
f32 frames = Animation_GetLastFrame(&object_ik_Anim_0029FC);
this->unk_2FE = 0;
this->unk_2F9 = (s8)frames;
this->unk_2F8 = 7;
this->unk_2FF = this->unk_2FE;
Animation_Change(&this->skelAnime, &D_060029FC, 1.0f, 0.0f, frames, ANIMMODE_LOOP, -4.0f);
Animation_Change(&this->skelAnime, &object_ik_Anim_0029FC, 1.0f, 0.0f, frames, ANIMMODE_LOOP, -4.0f);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_IRONNACK_PULLOUT);
EnIk_SetupAction(this, func_80A7510C);
}
@ -493,21 +468,21 @@ void func_80A7510C(EnIk* this, GlobalContext* globalCtx) {
if (this->unk_2F8 == 8) {
func_80A7489C(this);
} else {
frames = Animation_GetLastFrame(&D_06002538);
frames = Animation_GetLastFrame(&object_ik_Anim_002538);
this->unk_2F8 = 8;
Animation_Change(&this->skelAnime, &D_06002538, 1.5f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
Animation_Change(&this->skelAnime, &object_ik_Anim_002538, 1.5f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
}
}
}
void func_80A751C8(EnIk* this) {
f32 frames = Animation_GetLastFrame(&D_060033C4);
f32 frames = Animation_GetLastFrame(&object_ik_Anim_0033C4);
this->unk_2FF = 2;
this->unk_300 = 0;
this->unk_2F8 = 6;
this->actor.speedXZ = 0.0f;
Animation_Change(&this->skelAnime, &D_060033C4, 0.0f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -6.0f);
Animation_Change(&this->skelAnime, &object_ik_Anim_0033C4, 0.0f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -6.0f);
this->unk_2FC = 0;
EnIk_SetupAction(this, func_80A75260);
}
@ -541,11 +516,11 @@ void func_80A75260(EnIk* this, GlobalContext* globalCtx) {
}
void func_80A753D0(EnIk* this) {
f32 frames = Animation_GetLastFrame(&D_06003DBC);
f32 frames = Animation_GetLastFrame(&object_ik_Anim_003DBC);
this->unk_2FF = this->unk_2FE = 0;
this->unk_2F8 = 8;
Animation_Change(&this->skelAnime, &D_06003DBC, 1.5f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
Animation_Change(&this->skelAnime, &object_ik_Anim_003DBC, 1.5f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
EnIk_SetupAction(this, func_80A7545C);
}
@ -557,12 +532,12 @@ void func_80A7545C(EnIk* this, GlobalContext* globalCtx) {
}
void func_80A754A0(EnIk* this) {
f32 frames = Animation_GetLastFrame(&D_060033C4);
f32 frames = Animation_GetLastFrame(&object_ik_Anim_0033C4);
this->unk_2F8 = 1;
this->unk_2FF = 3;
this->actor.speedXZ = 0.0f;
Animation_Change(&this->skelAnime, &D_060033C4, 0.5f, 13.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
Animation_Change(&this->skelAnime, &object_ik_Anim_0033C4, 0.5f, 13.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
EnIk_SetupAction(this, func_80A75530);
}
@ -584,12 +559,12 @@ void func_80A75530(EnIk* this, GlobalContext* globalCtx) {
}
void func_80A755F0(EnIk* this) {
f32 frames = Animation_GetLastFrame(&D_0600485C);
f32 frames = Animation_GetLastFrame(&object_ik_Anim_00485C);
this->unk_2FE = 0;
this->unk_2F8 = 9;
this->actor.speedXZ = 0.0f;
Animation_Change(&this->skelAnime, &D_0600485C, 1.0f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
Animation_Change(&this->skelAnime, &object_ik_Anim_00485C, 1.0f, 0.0f, frames, ANIMMODE_ONCE_INTERP, -4.0f);
EnIk_SetupAction(this, func_80A7567C);
}
@ -617,11 +592,11 @@ void func_80A75790(EnIk* this) {
this->unk_2F8 = 0;
yawDiff = yaw - this->actor.shape.rot.y;
if (ABS(yawDiff) <= 0x4000) {
Animation_Change(&this->skelAnime, &D_06006194, 1.0f, 0.0f, Animation_GetLastFrame(&D_06006194), ANIMMODE_ONCE,
Animation_Change(&this->skelAnime, &object_ik_Anim_006194, 1.0f, 0.0f, Animation_GetLastFrame(&object_ik_Anim_006194), ANIMMODE_ONCE,
-4.0f);
this->actor.speedXZ = -6.0f;
} else {
Animation_Change(&this->skelAnime, &D_060045BC, 1.0f, 0.0f, Animation_GetLastFrame(&D_060045BC), ANIMMODE_ONCE,
Animation_Change(&this->skelAnime, &object_ik_Anim_0045BC, 1.0f, 0.0f, Animation_GetLastFrame(&object_ik_Anim_0045BC), ANIMMODE_ONCE,
-4.0f);
this->actor.speedXZ = 6.0f;
}
@ -645,12 +620,12 @@ void func_80A758B0(EnIk* this, GlobalContext* globalCtx) {
}
void func_80A7598C(EnIk* this) {
f32 frames = Animation_GetLastFrame(&D_06005944);
f32 frames = Animation_GetLastFrame(&object_ik_Anim_005944);
this->unk_2FE = 0;
this->unk_2F8 = 2;
this->actor.speedXZ = 0.0f;
Animation_Change(&this->skelAnime, &D_06005944, 1.0f, 0.0f, frames, ANIMMODE_ONCE, -4.0f);
Animation_Change(&this->skelAnime, &object_ik_Anim_005944, 1.0f, 0.0f, frames, ANIMMODE_ONCE, -4.0f);
this->unk_2F9 = 0x18;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_IRONNACK_DEAD);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_CUTBODY);
@ -697,7 +672,7 @@ void func_80A75C38(EnIk* this, GlobalContext* globalCtx) {
return;
}
if (this->shieldCollider.base.acFlags & AC_BOUNCED) {
temp_f0 = Animation_GetLastFrame(&D_0600485C) - 2.0f;
temp_f0 = Animation_GetLastFrame(&object_ik_Anim_00485C) - 2.0f;
if (this->skelAnime.curFrame < temp_f0) {
this->skelAnime.curFrame = temp_f0;
}
@ -835,11 +810,11 @@ s32 EnIk_OverrideLimbDraw3(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
if (limbIndex == 12) {
if (this->actor.params != 0) {
*dList = D_06018E78;
*dList = object_ik_DL_018E78;
}
} else if (limbIndex == 13) {
if (this->actor.params != 0) {
*dList = D_06019100;
*dList = object_ik_DL_019100;
}
} else if ((limbIndex == 26) || (limbIndex == 27)) {
if ((this->unk_2FA & 1)) {
@ -889,9 +864,9 @@ void EnIk_PostLimbDraw3(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ik_inFight.c", 1217),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->actor.params != 0) {
gSPDisplayList(POLY_XLU_DISP++, D_06019E08);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_019E08);
} else {
gSPDisplayList(POLY_XLU_DISP++, D_06016D88);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016D88);
}
} else if (limbIndex == 17) {
s32 i;
@ -927,25 +902,25 @@ void EnIk_PostLimbDraw3(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
case 22:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ik_inFight.c", 1270),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016F88);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016F88);
break;
case 24:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ik_inFight.c", 1275),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016EE8);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016EE8);
break;
case 26:
if (!(this->unk_2FA & 1)) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ik_inFight.c", 1281),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016BE0);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0);
}
break;
case 27:
if (!(this->unk_2FA & 1)) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ik_inFight.c", 1288),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016CD8);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016CD8);
}
break;
}
@ -1095,7 +1070,7 @@ void func_80A77148(EnIk* this) {
}
void func_80A77158(EnIk* this, GlobalContext* globalCtx) {
Animation_Change(&this->skelAnime, &D_0600C114, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600C114), ANIMMODE_ONCE,
Animation_Change(&this->skelAnime, &object_ik_Anim_00C114, 1.0f, 0.0f, Animation_GetLastFrame(&object_ik_Anim_00C114), ANIMMODE_ONCE,
0.0f);
func_80A770C0(this, globalCtx, 4);
this->action = 1;
@ -1104,7 +1079,7 @@ void func_80A77158(EnIk* this, GlobalContext* globalCtx) {
}
void func_80A771E4(EnIk* this) {
Animation_Change(&this->skelAnime, &D_0600C114, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600C114), ANIMMODE_ONCE,
Animation_Change(&this->skelAnime, &object_ik_Anim_00C114, 1.0f, 0.0f, Animation_GetLastFrame(&object_ik_Anim_00C114), ANIMMODE_ONCE,
0.0f);
this->action = 2;
this->drawMode = 1;
@ -1134,10 +1109,10 @@ void func_80A772EC(EnIk* this, GlobalContext* globalCtx) {
void func_80A7735C(EnIk* this, GlobalContext* globalCtx) {
s32 pad[3];
f32 frames = Animation_GetLastFrame(&D_060203D8);
f32 frames = Animation_GetLastFrame(&object_ik_Anim_0203D8);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060205C0, NULL, this->jointTable, this->morphTable, 30);
Animation_Change(&this->skelAnime, &D_060203D8, 1.0f, 0.0f, frames, ANIMMODE_ONCE, 0.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ik_Skel_0205C0, NULL, this->jointTable, this->morphTable, 30);
Animation_Change(&this->skelAnime, &object_ik_Anim_0203D8, 1.0f, 0.0f, frames, ANIMMODE_ONCE, 0.0f);
this->action = 3;
this->drawMode = 2;
func_80A770C0(this, globalCtx, 4);
@ -1198,18 +1173,18 @@ void EnIk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
if (EnIk_curFrame(&this->actor) < 30.0f) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inAwake.c", 267),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016D88);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016D88);
}
} break;
case 22:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inAwake.c", 274),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016F88);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016F88);
break;
case 24:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inAwake.c", 280),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016EE8);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016EE8);
break;
case 26: {
EnIk* this = THIS;
@ -1218,7 +1193,7 @@ void EnIk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inAwake.c", 288),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016BE0);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0);
}
} break;
case 27: {
@ -1228,7 +1203,7 @@ void EnIk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inAwake.c", 297),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016CD8);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016CD8);
}
} break;
}
@ -1359,27 +1334,27 @@ void EnIk_PostLimbDraw1(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
case 12:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inConfrontion.c", 575),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016D88);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016D88);
break;
case 22:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inConfrontion.c", 581),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016F88);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016F88);
break;
case 24:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inConfrontion.c", 587),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016EE8);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016EE8);
break;
case 26:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inConfrontion.c", 593),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016BE0);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0);
break;
case 27:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inConfrontion.c", 599),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016CD8);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016CD8);
break;
}
@ -1467,7 +1442,7 @@ void EnIk_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_Kill(&this->actor);
} else {
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0601E178, &D_0600C114, this->jointTable, this->morphTable,
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ik_Skel_01E178, &object_ik_Anim_00C114, this->jointTable, this->morphTable,
30);
func_80A74398(&this->actor, globalCtx);
func_80A780D0(this, globalCtx);

5
src/overlays/actors/ovl_En_Part/z_en_part.c
View file

@ -6,6 +6,7 @@
#include "z_en_part.h"
#include "objects/object_tite/object_tite.h"
#include "objects/object_ik/object_ik.h"
#define FLAGS 0x00000010
@ -28,8 +29,6 @@ const ActorInit En_Part_InitVars = {
(ActorFunc)EnPart_Draw,
};
extern Gfx D_06015380[];
void EnPart_Init(Actor* thisx, GlobalContext* globalCtx) {
}
@ -86,7 +85,7 @@ void func_80ACDDE8(EnPart* this, GlobalContext* globalCtx) {
case 7:
case 8:
this->actor.world.rot.y = this->actor.parent->shape.rot.y;
if (this->displayList == D_06015380) {
if (this->displayList == object_ik_DL_015380) {
sign = -1.0f;
}
this->actor.velocity.y = 0.0f;

4
src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c
View file

@ -6,6 +6,7 @@
#include "z_eff_ss_fhg_flash.h"
#include "overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h"
#include "objects/object_fhg/object_fhg.h"
#define rAlpha regs[0]
#define rObjBankIdx regs[2]
@ -26,7 +27,6 @@ EffectSsInit Effect_Ss_Fhg_Flash_InitVars = {
UNK_TYPE D_809A5178[];
Gfx D_809A5100[];
extern Gfx D_06012160[];
u32 EffectSsFhgFlash_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
EffectSsFhgFlashInitParams* initParams = (EffectSsFhgFlashInitParams*)initParamsx;
@ -52,7 +52,7 @@ u32 EffectSsFhgFlash_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, v
this->rAlpha = 255;
this->draw = EffectSsFhgFlash_DrawLightBall;
this->update = EffectSsFhgFlash_UpdateLightBall;
this->gfx = SEGMENTED_TO_VIRTUAL(D_06012160);
this->gfx = SEGMENTED_TO_VIRTUAL(gPhantomEnergyBallDL);
gSegments[6] = oldSeg6;
} else {
osSyncPrintf("Effect_Ss_Fhg_Flash_ct():pffd->modeエラー\n");

5
src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c
View file

@ -5,6 +5,7 @@
*/
#include "z_eff_ss_g_magma2.h"
#include "objects/object_kingdodongo/object_kingdodongo.h"
#define rPrimColorR regs[0]
#define rPrimColorG regs[1]
@ -33,8 +34,6 @@ EffectSsInit Effect_Ss_G_Magma2_InitVars = {
EffectSsGMagma2_Init,
};
extern Gfx D_06025A90[];
u32 EffectSsGMagma2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
s32 objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_KINGDODONGO);
s32 pad;
@ -51,7 +50,7 @@ u32 EffectSsGMagma2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, vo
this->life = 100;
this->draw = EffectSsGMagma2_Draw;
this->update = EffectSsGMagma2_Update;
this->gfx = SEGMENTED_TO_VIRTUAL(D_06025A90);
this->gfx = SEGMENTED_TO_VIRTUAL(object_kingdodongo_DL_025A90);
this->rTexIdx = 0;
this->rDrawMode = initParams->drawMode;
this->rUpdateRate = initParams->updateRate;