mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-26 22:32:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup object syms (#546)

Browse Source 
* First

* Part2

* Save now or forever hold your peace

* Part3

* Building

* OK

* Cleanup

* Merge

* PR

* PR

* Merge

* PR

* PR

* Use oyu

* Use names

* TexturePtr
This commit is contained in:
Maide
2022-01-22 18:30:32 +00:00
committed by GitHub
parent 2a913635a4
commit 7ed396f09e
216 changed files with 1960 additions and 4802 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_eff_blure.c
+3 -2
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "objects/gameplay_keep/gameplay_keep.h"
void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) {
EffectBlureElement* elem;
@@ -720,8 +721,8 @@ void EffectBlure_SetupSimpleAlt(GraphicsContext* gfxCtx, EffectBlure* this, Vtx*
gDPSetTextureLUT(POLY_XLU_DISP++, G_TT_NONE);
gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
gDPLoadTextureBlock(POLY_XLU_DISP++, D_04014570, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP,
G_TX_NOMIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPLoadTextureBlock(POLY_XLU_DISP++, gameplay_keep_Tex_014570, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0,
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPSetCombineLERP(POLY_XLU_DISP++, TEXEL0, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE,
ENVIRONMENT, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED);
src/code/z_eff_shield_particle.c
+3 -2
View File
@@ -2,6 +2,7 @@
#include "vt.h"
#include "assets/code/eff_shield_particle/eff_shield_particle.c"
#include "objects/gameplay_keep/gameplay_keep.h"
void EffectShieldParticle_Init(void* thisx, void* initParamsx) {
EffectShieldParticle* this = (EffectShieldParticle*)thisx;
@@ -154,8 +155,8 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
gDPLoadTextureBlock(POLY_XLU_DISP++, D_04054F20, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPLoadTextureBlock(POLY_XLU_DISP++, gameplay_keep_Tex_054F20, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPSetCombineLERP(POLY_XLU_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, 0, 0,
0, COMBINED, 0, 0, 0, COMBINED);
src/code/z_eff_spark.c
+3 -2
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "objects/gameplay_keep/gameplay_keep.h"
void EffectSpark_Init(void* thisx, void* initParamsx) {
EffectSpark* this = (EffectSpark*)thisx;
@@ -152,8 +153,8 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
gDPLoadTextureBlock(POLY_XLU_DISP++, D_04054F20, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPLoadTextureBlock(POLY_XLU_DISP++, gameplay_keep_Tex_054F20, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPSetCombineMode(POLY_XLU_DISP++, G_CC_SHADEDECALA, G_CC_PASS2);
gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_ZB_CLD_SURF2);
src/code/z_eff_tire_mark.c
+2 -1
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "objects/gameplay_keep/gameplay_keep.h"
void func_800AE930(CollisionContext* colCtx, EffectTireMark* this, Vec3f* pos, f32 arg3, s16 arg4,
CollisionPoly* colPoly, s32 arg6) {
@@ -233,7 +234,7 @@ void EffectTireMark_Draw(void* thisx, GraphicsContext* gfxCtx) {
POLY_OPA_DISP = Gfx_CallSetupDL(POLY_OPA_DISP++, 0x2C);
gDPSetRenderMode(POLY_OPA_DISP++, G_RM_PASS, G_RM_ZB_CLD_SURF2);
gDPLoadTextureBlock(POLY_OPA_DISP++, D_04014570, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0,
gDPLoadTextureBlock(POLY_OPA_DISP++, gameplay_keep_Tex_014570, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0,
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPSetCombineLERP(POLY_OPA_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0,
src/code/z_en_item00.c
+25 -26
View File
@@ -1,4 +1,6 @@
#include "global.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_gi_hearts/object_gi_hearts.h"
#define FLAGS 0x00000000
@@ -693,12 +695,12 @@ void EnItem00_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
}
UNK_PTR D_801ADF30[5] = {
&D_04061FC0, // Green rupee
&D_04061FE0, // Blue rupee
&D_04062000, // Red rupee
&D_04062040, // Orange rupee
&D_04062020 // Purple rupee
TexturePtr D_801ADF30[] = {
gameplay_keep_Tex_061FC0, // Green rupee
gameplay_keep_Tex_061FE0, // Blue rupee
gameplay_keep_Tex_062000, // Red rupee
gameplay_keep_Tex_062040, // Orange rupee
gameplay_keep_Tex_062020 // Purple rupee
};
void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx) {
@@ -720,24 +722,24 @@ void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx) {
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(D_801ADF30[iconNb]));
gSPDisplayList(POLY_OPA_DISP++, &D_040622C0); // TODO symbol
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_0622C0); // TODO symbol
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
UNK_PTR D_801ADF44[12] = {
&D_0405E6F0, // Heart (Not used)
&D_0405CEF0, // Bombs (A), Bombs (0)
&D_0405BEF0, // Arrows (10)
&D_0405B6F0, // Arrows (30)
&D_0405C6F0, // Arrows (40), Arrows (50)
&D_0405CEF0, // Bombs (B)
&D_040607C0, // Nuts (1), Nuts (10)
&D_04060FC0, // Sticks (1)
&D_040617C0, // Magic (Large)
&D_0405FFC0, // Magic (Small)
TexturePtr D_801ADF44[12] = {
gameplay_keep_Tex_05E6F0, // Heart (Not used)
gameplay_keep_Tex_05CEF0, // Bombs (A), Bombs (0)
gameplay_keep_Tex_05BEF0, // Arrows (10)
gameplay_keep_Tex_05B6F0, // Arrows (30)
gameplay_keep_Tex_05C6F0, // Arrows (40), Arrows (50)
gameplay_keep_Tex_05CEF0, // Bombs (B)
gameplay_keep_Tex_0607C0, // Nuts (1), Nuts (10)
gameplay_keep_Tex_060FC0, // Sticks (1)
gameplay_keep_Tex_0617C0, // Magic (Large)
gameplay_keep_Tex_05FFC0, // Magic (Small)
NULL,
&D_0405F7C0 // Small Key
gameplay_keep_Tex_05F7C0 // Small Key
};
void EnItem00_DrawSprite(EnItem00* this, GlobalContext* globalCtx) {
@@ -764,14 +766,11 @@ void EnItem00_DrawSprite(EnItem00* this, GlobalContext* globalCtx) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, D_0405F6F0);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_05F6F0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
extern Gfx D_06001290[];
extern Gfx D_06001470[];
void EnItem00_DrawHeartContainer(EnItem00* actor, GlobalContext* globalCtx) {
s32 pad;
s32 pad2;
@@ -784,8 +783,8 @@ void EnItem00_DrawHeartContainer(EnItem00* actor, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, D_06001290);
gSPDisplayList(POLY_XLU_DISP++, D_06001470);
gSPDisplayList(POLY_XLU_DISP++, object_gi_hearts_DL_001290);
gSPDisplayList(POLY_XLU_DISP++, object_gi_hearts_DL_001470);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -801,7 +800,7 @@ void EnItem00_DrawHeartPiece(EnItem00* this, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, D_0405AAB0);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_05AAB0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
src/code/z_lights.c
+3 -2
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "objects/gameplay_keep/gameplay_keep.h"
void Lights_PointSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius, s32 type) {
info->type = type;
@@ -418,7 +419,7 @@ void Lights_DrawGlow(GlobalContext* globalCtx) {
gDPSetCombineLERP(dl++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE,
0);
gSPDisplayList(dl++, D_04029CB0);
gSPDisplayList(dl++, gameplay_keep_DL_029CB0);
do {
if (light->info->type == LIGHT_POINT_GLOW) {
@@ -434,7 +435,7 @@ void Lights_DrawGlow(GlobalContext* globalCtx) {
gSPMatrix(dl++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(dl++, D_04029CF0);
gSPDisplayList(dl++, gameplay_keep_DL_029CF0);
}
}
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
+4 -4
View File
@@ -5,6 +5,8 @@
*/
#include "z_arms_hook.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_link_child/object_link_child.h"
#define FLAGS 0x00000030
@@ -50,8 +52,6 @@ static ColliderQuadInit D_808C1BC0 = {
{ { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } },
};
extern Gfx D_0601D960[];
void ArmsHook_SetupAction(ArmsHook* this, ArmsHookActionFunc actionFunc) {
this->actionFunc = actionFunc;
}
@@ -323,7 +323,7 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_80122868(globalCtx, player);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_0601D960);
gSPDisplayList(POLY_OPA_DISP++, object_link_child_DL_01D960);
Matrix_InsertTranslation(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z,
MTXMODE_NEW);
Math_Vec3f_Diff(&player->rightHandWorld.pos, &this->actor.world.pos, &sp68);
@@ -334,7 +334,7 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) {
f0 = sqrtf(SQ(sp68.y) + sp48);
Matrix_Scale(0.015f, 0.015f, f0 * 0.01f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_040008D0);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_0008D0);
func_801229A0(globalCtx, player);
CLOSE_DISPS(globalCtx->state.gfxCtx);
src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c
+6 -13
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_ctower_gear.h"
#include "objects/object_ctower_rot/object_ctower_rot.h"
#define FLAGS 0x00000010
@@ -39,14 +40,6 @@ const ActorInit Bg_Ctower_Gear_InitVars = {
(ActorFunc)BgCtowerGear_Draw,
};
extern Gfx D_06010828[];
extern Gfx D_06015F30[];
extern Gfx D_060160A0[];
extern CollisionHeader D_06016E70;
extern Gfx D_06017018[];
extern Gfx D_06018118[];
extern CollisionHeader D_06018588;
static Vec3f D_80AD3270[] = {
{ -70.0f, -60.0f, 8.0f }, { -60.0f, -60.0f, -9.1f }, { -75.0f, -60.0f, -9.1f }, { -70.0f, -60.0f, -26.2f }
};
@@ -75,7 +68,7 @@ static InitChainEntry sInitChainOrgan[] = {
ICHAIN_F32(uncullZoneDownward, 570, ICHAIN_STOP),
};
static Gfx* D_80AD32E8[] = { D_06010828, D_06017018, D_06018118 };
static Gfx* D_80AD32E8[] = { object_ctower_rot_DL_010828, object_ctower_rot_DL_017018, object_ctower_rot_DL_018118 };
void BgCtowerGear_Splash(BgCtowerGear* this, GlobalContext* globalCtx) {
int i;
@@ -144,10 +137,10 @@ void BgCtowerGear_Init(Actor* thisx, GlobalContext* globalCtx) {
}
if (type == WATER_WHEEL) {
DynaPolyActor_Init(&this->dyna, 3);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06018588);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ctower_rot_Colheader_018588);
} else if (type == ORGAN) {
DynaPolyActor_Init(&this->dyna, 0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06016E70);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ctower_rot_Colheader_016E70);
func_800C62BC(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
}
@@ -207,9 +200,9 @@ void BgCtowerGear_DrawOrgan(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_060160A0);
gSPDisplayList(POLY_OPA_DISP++, object_ctower_rot_DL_0160A0);
func_8012C2DC(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06015F30);
gSPDisplayList(POLY_XLU_DISP++, object_ctower_rot_DL_015F30);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c
+7 -13
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_ctower_rot.h"
#include "objects/object_ctower_rot/object_ctower_rot.h"
#define FLAGS 0x00000030
@@ -32,19 +33,12 @@ const ActorInit Bg_Ctower_Rot_InitVars = {
(ActorFunc)BgCtowerRot_Draw,
};
extern Gfx D_060129D0[];
extern Gfx D_06012DA0[];
extern CollisionHeader D_060142E8;
extern Gfx D_06017220[];
extern CollisionHeader D_06017410;
extern Gfx D_060174E0[];
extern CollisionHeader D_06017650;
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
static Gfx* bgCtowerRotDlists[] = { D_06012DA0, D_06017220, D_060174E0 };
static Gfx* bgCtowerRotDlists[] = { object_ctower_rot_DL_012DA0, object_ctower_rot_DL_017220,
object_ctower_rot_DL_0174E0 };
void BgCtowerRot_Init(Actor* thisx, GlobalContext* globalCtx) {
BgCtowerRot* this = THIS;
@@ -55,16 +49,16 @@ void BgCtowerRot_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
if (this->dyna.actor.params == CORRIDOR) {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_060142E8);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ctower_rot_Colheader_0142E8);
this->actionFunc = BgCtowerRot_CorridorRotate;
return;
}
player = GET_PLAYER(globalCtx);
if (this->dyna.actor.params == MAIN_DOOR) {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06017410);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ctower_rot_Colheader_017410);
this->dyna.actor.world.rot.y = this->dyna.actor.shape.rot.y + 0x4000;
} else {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06017650);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ctower_rot_Colheader_017650);
this->dyna.actor.world.rot.y = this->dyna.actor.shape.rot.y - 0x4000;
}
Actor_OffsetOfPointInActorCoords(&this->dyna.actor, &offset, &player->actor.world.pos);
@@ -161,6 +155,6 @@ void BgCtowerRot_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, bgCtowerRotDlists[this->dyna.actor.params]);
if (this->dyna.actor.params == CORRIDOR) {
Gfx_DrawDListXlu(globalCtx, D_060129D0);
Gfx_DrawDListXlu(globalCtx, object_ctower_rot_DL_0129D0);
}
}
src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c
+3 -5
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_fu_kaiten.h"
#include "objects/object_fu_kaiten/object_fu_kaiten.h"
#define FLAGS 0x00000030
@@ -27,9 +28,6 @@ const ActorInit Bg_Fu_Kaiten_InitVars = {
(ActorFunc)BgFuKaiten_Draw,
};
extern Gfx D_060005D0[];
extern CollisionHeader D_06002D30;
void BgFuKaiten_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgFuKaiten* this = THIS;
@@ -37,7 +35,7 @@ void BgFuKaiten_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(thisx, 1.0);
DynaPolyActor_Init(&this->dyna, 3);
CollisionHeader_GetVirtual(&D_06002D30, &header);
CollisionHeader_GetVirtual(&object_fu_kaiten_Colheader_002D30, &header);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, header);
this->bounceHeight = 0.0;
@@ -82,6 +80,6 @@ void BgFuKaiten_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_060005D0);
gSPDisplayList(POLY_OPA_DISP++, object_fu_kaiten_DL_0005D0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
+5 -9
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_goron_oyu.h"
#include "objects/object_oyu/object_oyu.h"
#define FLAGS 0x00000030
@@ -34,11 +35,6 @@ const ActorInit Bg_Goron_Oyu_InitVars = {
(ActorFunc)BgGoronOyu_Draw,
};
extern Gfx D_06000080;
extern Gfx D_06000158;
extern AnimatedMaterial D_06000968;
extern CollisionHeader D_06000988;
void func_80B40080(BgGoronOyu* this) {
this->unk_17E = 1;
this->actionFunc = func_80B400C8;
@@ -157,7 +153,7 @@ void BgGoronOyu_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->dyna.actor, 0.1f);
DynaPolyActor_Init(&this->dyna, 1);
CollisionHeader_GetVirtual(&D_06000988, &colHeader);
CollisionHeader_GetVirtual(&object_oyu_Colheader_000988, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
@@ -188,9 +184,9 @@ void BgGoronOyu_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgGoronOyu_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C2DC(globalCtx->state.gfxCtx);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_06000968));
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_oyu_Matanimheader_000968));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, &D_06000158);
gSPDisplayList(POLY_XLU_DISP++, &D_06000080);
gSPDisplayList(POLY_XLU_DISP++, &object_oyu_DL_000158);
gSPDisplayList(POLY_XLU_DISP++, &object_oyu_DL_000080);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c
+3 -5
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_haka_curtain.h"
#include "objects/object_haka_obj/object_haka_obj.h"
#define FLAGS 0x00000010
@@ -44,15 +45,12 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
extern CollisionHeader D_06001588;
extern Gfx D_06001410[];
void BgHakaCurtain_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHakaCurtain* this = THIS;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06001588);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_haka_obj_Colheader_001588);
if (Flags_GetClear(globalCtx, this->dyna.actor.room)) {
func_80B6DE80(this);
return;
@@ -137,5 +135,5 @@ void BgHakaCurtain_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaCurtain_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_06001410);
Gfx_DrawDListOpa(globalCtx, object_haka_obj_DL_001410);
}
src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c
+3 -5
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_haka_tomb.h"
#include "objects/object_haka_obj/object_haka_obj.h"
#define FLAGS 0x00000000
@@ -22,9 +23,6 @@ void func_80BD6768(BgHakaTomb* this, GlobalContext* globalCtx);
void BgHakaTomb_SetupDoNothing(BgHakaTomb* this);
void BgHakaTomb_DoNothing(BgHakaTomb* this, GlobalContext* globalCtx);
extern CollisionHeader D_06000EE8[];
extern Gfx D_060007B0[];
const ActorInit Bg_Haka_Tomb_InitVars = {
ACTOR_BG_HAKA_TOMB,
ACTORCAT_BG,
@@ -48,7 +46,7 @@ void BgHakaTomb_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, D_06000EE8);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_haka_obj_Colheader_000EE8);
func_8013E3B8(&this->dyna.actor, this->cutscenes, ARRAY_COUNT(this->cutscenes));
func_80BD6624(this);
}
@@ -128,5 +126,5 @@ void BgHakaTomb_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaTomb_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_060007B0);
Gfx_DrawDListOpa(globalCtx, object_haka_obj_DL_0007B0);
}
src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c
+8 -13
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_hakugin_post.h"
#include "objects/object_hakugin_obj/object_hakugin_obj.h"
#define FLAGS 0x00000030
@@ -32,13 +33,6 @@ void func_80A9D3E4(BgHakuginPost* this);
void func_80A9D434(BgHakuginPost* this, GlobalContext* globalCtx);
void func_80A9D61C(Actor* thisx, GlobalContext* globalCtx);
extern Gfx D_0600C1A8[];
extern Gfx D_0600C568[];
extern Gfx D_0600CA38[];
extern Gfx D_0600CEC8[];
extern Gfx D_0600D098[];
extern CollisionHeader D_0600D3B0;
BgHakuginPostColliders D_80A9DDC0;
BgHakuginPostUnkStruct D_80A9E028;
@@ -705,7 +699,7 @@ void BgHakuginPost_Init(Actor* thisx, GlobalContext* globalCtx) {
this->dyna.actor.shape.rot.x = 0;
this->dyna.actor.shape.rot.z = 0;
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_0600D3B0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_hakugin_obj_Colheader_00D3B0);
func_80A9B3BC(this, globalCtx);
func_80A9CA94(this);
} else {
@@ -996,13 +990,14 @@ void BgHakuginPost_Update(Actor* thisx, GlobalContext* globalCtx) {
void func_80A9D61C(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* D_80A9D900[] = {
D_0600C1A8, D_0600C568, NULL, NULL, D_0600CA38, D_0600CEC8, NULL,
object_hakugin_obj_DL_00C1A8, object_hakugin_obj_DL_00C568, NULL, NULL,
object_hakugin_obj_DL_00CA38, object_hakugin_obj_DL_00CEC8, NULL,
};
static Gfx* D_80A9D91C[] = {
D_0600D098,
D_0600D098,
D_0600D098,
D_0600D098,
object_hakugin_obj_DL_00D098,
object_hakugin_obj_DL_00D098,
object_hakugin_obj_DL_00D098,
object_hakugin_obj_DL_00D098,
};
BgHakuginPost* this = THIS;
BgHakuginPostUnkStruct1* unkStruct1;
src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c
+3 -5
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_icicle.h"
#include "objects/object_icicle/object_icicle.h"
#define FLAGS 0x00000000
@@ -60,9 +61,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
extern Gfx D_060000D0[];
extern CollisionHeader D_06000294;
void BgIcicle_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgIcicle* this = THIS;
@@ -71,7 +69,7 @@ void BgIcicle_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(thisx, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000294);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_icicle_Colheader_000294);
Collider_InitAndSetCylinder(globalCtx, &this->collider, thisx, &sCylinderInit);
Collider_UpdateCylinder(thisx, &this->collider);
@@ -245,5 +243,5 @@ void BgIcicle_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgIcicle_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_060000D0);
Gfx_DrawDListOpa(globalCtx, object_icicle_DL_0000D0);
}
src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c
+3 -5
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_ikana_ray.h"
#include "objects/object_ikana_obj/object_ikana_obj.h"
#define FLAGS 0x00000000
@@ -59,9 +60,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
extern Gfx D_06001100[];
extern AnimatedMaterial D_06001228[];
void BgIkanaRay_Init(Actor* thisx, GlobalContext* globalCtx) {
BgIkanaRay* this = THIS;
ColliderCylinder* collision = &this->collision;
@@ -71,7 +69,7 @@ void BgIkanaRay_Init(Actor* thisx, GlobalContext* globalCtx) {
Collider_SetCylinder(globalCtx, collision, &this->actor, &sCylinderInit);
Collider_UpdateCylinder(&this->actor, &this->collision);
this->animatedTextures = (AnimatedMaterial*)Lib_SegmentedToVirtual(D_06001228);
this->animatedTextures = (AnimatedMaterial*)Lib_SegmentedToVirtual(object_ikana_obj_Matanimheader_001228);
if (Flags_GetSwitch(globalCtx, this->actor.params & 0x7F)) {
BgIkanaRay_SetActivated(this);
@@ -119,5 +117,5 @@ void BgIkanaRay_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgIkanaRay* this = THIS;
AnimatedMat_Draw(globalCtx, this->animatedTextures);
Gfx_DrawDListXlu(globalCtx, D_06001100);
Gfx_DrawDListXlu(globalCtx, object_ikana_obj_DL_001100);
}
src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c
+3 -5
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_ikana_shutter.h"
#include "objects/object_ikana_obj/object_ikana_obj.h"
#define FLAGS 0x00000010
@@ -53,9 +54,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
extern CollisionHeader D_06000F28;
extern Gfx D_06000CE8[];
s32 BgIkanaShutter_AllSwitchesPressed(BgIkanaShutter* this, GlobalContext* globalCtx) {
return Flags_GetSwitch(globalCtx, this->dyna.actor.params & 0x7F) &&
Flags_GetSwitch(globalCtx, (this->dyna.actor.params & 0x7F) + 1) &&
@@ -68,7 +66,7 @@ void BgIkanaShutter_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000F28);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ikana_obj_Colheader_000F28);
if (!((this->dyna.actor.params >> 8) & 1)) {
if (BgIkanaShutter_AllSwitchesPressed(this, globalCtx)) {
func_80BD599C(this);
@@ -213,5 +211,5 @@ void BgIkanaShutter_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgIkanaShutter_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_06000CE8);
Gfx_DrawDListOpa(globalCtx, object_ikana_obj_DL_000CE8);
}
src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
+4 -7
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_iknin_susceil.h"
#include "objects/object_ikninside_obj/object_ikninside_obj.h"
#define FLAGS 0x00000030
@@ -26,10 +27,6 @@ void func_80C0AD44(BgIkninSusceil* this);
void func_80C0AD64(BgIkninSusceil* this, GlobalContext* globalCtx);
void func_80C0AE5C(BgIkninSusceil* this, GlobalContext* globalCtx);
extern CollisionHeader D_0600CBAC;
extern AnimatedMaterial D_0600C670;
extern Gfx D_0600C308[];
const ActorInit Bg_Iknin_Susceil_InitVars = {
ACTOR_BG_IKNIN_SUSCEIL,
ACTORCAT_BG,
@@ -116,8 +113,8 @@ void BgIkninSusceil_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_0600CBAC);
this->animatedTexture = Lib_SegmentedToVirtual(&D_0600C670);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ikninside_obj_Colheader_00CBAC);
this->animatedTexture = Lib_SegmentedToVirtual(object_ikninside_obj_Matanimheader_00C670);
func_80C0AC74(this);
}
@@ -260,5 +257,5 @@ void BgIkninSusceil_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgIkninSusceil* this = THIS;
AnimatedMat_Draw(globalCtx, this->animatedTexture);
Gfx_DrawDListOpa(globalCtx, D_0600C308);
Gfx_DrawDListOpa(globalCtx, object_ikninside_obj_DL_00C308);
}
src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c
+6 -11
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_iknv_obj.h"
#include "objects/object_iknv_obj/object_iknv_obj.h"
#define FLAGS 0x00000010
@@ -20,12 +21,6 @@ void BgIknvObj_UpdateWaterwheel(BgIknvObj* this, GlobalContext* globalCtx);
void BgIknvObj_UpdateRaisedDoor(BgIknvObj* this, GlobalContext* globalCtx);
void BgIknvObj_UpdateSakonDoor(BgIknvObj* this, GlobalContext* globalCtx);
extern CollisionHeader D_060119D4;
extern CollisionHeader D_06012CA4;
extern Gfx D_06011880[];
extern Gfx D_060129C8[];
extern Gfx D_06013058[];
const ActorInit Bg_Iknv_Obj_InitVars = {
ACTOR_BG_IKNV_OBJ,
ACTORCAT_BG,
@@ -67,24 +62,24 @@ void BgIknvObj_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actionFunc = BgIknvObj_DoNothing;
switch (IKNV_OBJ_TYPE(this)) {
case IKNV_OBJ_WATERWHEEL:
this->displayListPtr = D_06013058;
this->displayListPtr = object_iknv_obj_DL_013058;
this->actionFunc = BgIknvObj_UpdateWaterwheel;
this->dyna.actor.flags |= 0x100000;
this->dyna.actor.flags |= 0x10;
break;
case IKNV_OBJ_RAISED_DOOR:
this->displayListPtr = D_06011880;
this->displayListPtr = object_iknv_obj_DL_011880;
DynaPolyActor_Init(&this->dyna, 0);
CollisionHeader_GetVirtual(&D_060119D4, &colHeader);
CollisionHeader_GetVirtual(&object_iknv_obj_Colheader_0119D4, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
this->actionFunc = BgIknvObj_UpdateRaisedDoor;
this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y + 120.0f;
break;
case IKNV_OBJ_SAKON_DOOR:
this->displayListPtr = D_060129C8;
this->displayListPtr = object_iknv_obj_DL_0129C8;
this->actionFunc = BgIknvObj_UpdateSakonDoor;
DynaPolyActor_Init(&this->dyna, 0);
CollisionHeader_GetVirtual(&D_06012CA4, &colHeader);
CollisionHeader_GetVirtual(&object_iknv_obj_Colheader_012CA4, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->dyna.actor, &sCylinderInit);
Collider_UpdateCylinder(&this->dyna.actor, &this->collider);
src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c
+4 -9
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_inibs_movebg.h"
#include "objects/object_inibs_object/object_inibs_object.h"
#define FLAGS 0x00000030
@@ -26,15 +27,9 @@ const ActorInit Bg_Inibs_Movebg_InitVars = {
(ActorFunc)BgInibsMovebg_Draw,
};
extern Gfx D_06001C10[];
extern Gfx D_06001DC0[];
extern AnimatedMaterial D_06002598;
extern Gfx D_06006140[];
extern Gfx D_060062D8[];
extern AnimatedMaterial D_06006858;
Gfx* D_80B96560[] = { D_060062D8, D_06001DC0 };
Gfx* D_80B96568[] = { D_06006140, D_06001C10 };
AnimatedMaterial* D_80B96570[] = { &D_06006858, &D_06002598 };
Gfx* D_80B96560[] = { object_inibs_object_DL_0062D8, object_inibs_object_DL_001DC0 };
Gfx* D_80B96568[] = { object_inibs_object_DL_006140, object_inibs_object_DL_001C10 };
AnimatedMaterial* D_80B96570[] = { object_inibs_object_Matanimheader_006858, object_inibs_object_Matanimheader_002598 };
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP),
src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c
+7 -13
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_keikoku_spr.h"
#include "objects/object_keikoku_obj/object_keikoku_obj.h"
#define FLAGS 0x00000000
@@ -34,13 +35,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 20, ICHAIN_STOP),
};
extern Gfx D_06000100[];
extern AnimatedMaterial D_060001F8;
extern Gfx D_06000300[];
extern AnimatedMaterial D_060003F8;
extern Gfx D_06000500[];
extern AnimatedMaterial D_060005F8;
void BgKeikokuSpr_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(thisx, sInitChain);
}
@@ -56,13 +50,13 @@ void BgKeikokuSpr_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_060001F8));
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_keikoku_obj_Matanimheader_0001F8));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06000100);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_060003F8));
gSPDisplayList(POLY_XLU_DISP++, D_06000300);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_060005F8));
gSPDisplayList(POLY_XLU_DISP++, D_06000500);
gSPDisplayList(POLY_XLU_DISP++, object_keikoku_obj_DL_000100);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_keikoku_obj_Matanimheader_0003F8));
gSPDisplayList(POLY_XLU_DISP++, object_keikoku_obj_DL_000300);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_keikoku_obj_Matanimheader_0005F8));
gSPDisplayList(POLY_XLU_DISP++, object_keikoku_obj_DL_000500);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c
+3 -5
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_kin2_fence.h"
#include "objects/object_kin2_obj/object_kin2_obj.h"
#define FLAGS 0x00000010
@@ -118,9 +119,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
extern Gfx D_06000828[];
extern CollisionHeader D_06000908;
s32 BgKin2Fence_CheckHitMask(BgKin2Fence* this) {
ColliderJntSphElement* elements = this->collider.elements;
@@ -159,7 +157,7 @@ void BgKin2Fence_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000908);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_kin2_obj_Colheader_000908);
Collider_InitJntSph(globalCtx, &this->collider);
Collider_SetJntSph(globalCtx, &this->collider, &this->dyna.actor, &sJntSphInit, this->colliderElements);
Matrix_SetStateRotationAndTranslation(this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y,
@@ -272,5 +270,5 @@ void BgKin2Fence_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgKin2Fence_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_06000828);
Gfx_DrawDListOpa(globalCtx, object_kin2_obj_DL_000828);
}
src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c
+9 -18
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_ladder.h"
#include "objects/object_ladder/object_ladder.h"
#define FLAGS 0x00000010
@@ -19,16 +20,6 @@ void BgLadder_ActionStartCutscene(BgLadder* this, GlobalContext* globalCtx);
void BgLadder_ActionFadeIn(BgLadder* this, GlobalContext* globalCtx);
void BgLadder_ActionIdle(BgLadder* this, GlobalContext* globalCtx);
extern Gfx D_060000A0[];
extern Gfx D_060002D0[];
extern Gfx D_06000500[];
extern Gfx D_06000730[];
extern CollisionHeader D_060001D8;
extern CollisionHeader D_06000408;
extern CollisionHeader D_06000638;
extern CollisionHeader D_06000868;
const ActorInit Bg_Ladder_InitVars = {
ACTOR_BG_LADDER,
ACTORCAT_PROP,
@@ -46,10 +37,10 @@ static InitChainEntry sInitChain[] = {
};
static Gfx* sLadderDLists[] = {
D_060000A0, // 12 Rung
D_060002D0, // 16 Rung
D_06000500, // 20 Rung
D_06000730, // 24 Rung
object_ladder_DL_0000A0, // 12 Rung
object_ladder_DL_0002D0, // 16 Rung
object_ladder_DL_000500, // 20 Rung
object_ladder_DL_000730, // 24 Rung
};
void BgLadder_Init(Actor* thisx, GlobalContext* globalCtx) {
@@ -65,13 +56,13 @@ void BgLadder_Init(Actor* thisx, GlobalContext* globalCtx) {
size = thisx->params;
if (size == LADDER_SIZE_12RUNG) {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_060001D8);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ladder_Colheader_0001D8);
} else if (size == LADDER_SIZE_16RUNG) {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000408);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ladder_Colheader_000408);
} else if (size == LADDER_SIZE_20RUNG) {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000638);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ladder_Colheader_000638);
} else if (size == LADDER_SIZE_24RUNG) {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000868);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ladder_Colheader_000868);
} else {
Actor_MarkForDeath(&this->dyna.actor);
return;
src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c
+3 -5
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_lbfshot.h"
#include "objects/object_lbfshot/object_lbfshot.h"
#define FLAGS 0x00000000
@@ -30,16 +31,13 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
extern CollisionHeader D_060014D8;
extern Gfx D_06000228[];
void BgLbfshot_Init(Actor* thisx, GlobalContext* globalCtx) {
BgLbfshot* this = THIS;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
this->dyna.actor.uncullZoneForward = 4000.0f;
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_060014D8);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_lbfshot_Colheader_0014D8);
}
void BgLbfshot_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgLbfshot* this = THIS;
@@ -47,5 +45,5 @@ void BgLbfshot_Destroy(Actor* thisx, GlobalContext* globalCtx) {
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
void BgLbfshot_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_06000228);
Gfx_DrawDListOpa(globalCtx, object_lbfshot_DL_000228);
}
src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c
+3 -5
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_lotus.h"
#include "objects/object_lotus/object_lotus.h"
#define FLAGS 0x00000000
@@ -35,9 +36,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
extern CollisionHeader D_06000A20; // Lilypad collision
extern Gfx D_06000040[]; // Lilypad model
void BgLotus_Init(Actor* thisx, GlobalContext* globalCtx) {
BgLotus* this = THIS;
s32 pad;
@@ -45,7 +43,7 @@ void BgLotus_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000A20);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_lotus_Colheader_000A20);
this->dyna.actor.floorHeight = BgCheck_EntityRaycastFloor5(&globalCtx->colCtx, &thisx->floorPoly, &bgId,
&this->dyna.actor, &this->dyna.actor.world.pos);
this->timer2 = 96;
@@ -173,5 +171,5 @@ void BgLotus_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgLotus_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_06000040);
Gfx_DrawDListOpa(globalCtx, object_lotus_DL_000040);
}
src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c
+3 -6
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_market_step.h"
#include "objects/object_market_obj/object_market_obj.h"
#define FLAGS 0x10000020
@@ -26,12 +27,8 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP),
};
extern Gfx D_0601F050[];
extern Gfx D_06018DA0[];
extern Gfx D_0601EF10[];
extern Gfx D_06018C60[];
Gfx* D_80AF0120[] = { D_0601F050, D_06018DA0 };
Gfx* D_80AF0128[] = { D_0601EF10, D_06018C60 };
Gfx* D_80AF0120[] = { object_market_obj_DL_01F050, object_market_obj_DL_018DA0 };
Gfx* D_80AF0128[] = { object_market_obj_DL_01EF10, object_market_obj_DL_018C60 };
void BgMarketStep_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMarketStep* this = THIS;
src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c
+3 -5
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_mbar_chair.h"
#include "objects/object_mbar_obj/object_mbar_obj.h"
#define FLAGS 0x00000000
@@ -34,15 +35,12 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
extern CollisionHeader D_060019B4;
extern Gfx D_06000288[];
void BgMbarChair_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMbarChair* this = THIS;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_060019B4);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_mbar_obj_Colheader_0019B4);
}
void BgMbarChair_Destroy(Actor* thisx, GlobalContext* globalCtx) {
@@ -55,5 +53,5 @@ void BgMbarChair_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgMbarChair_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_06000288);
Gfx_DrawDListOpa(globalCtx, object_mbar_obj_DL_000288);
}
src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c
+3 -5
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_tobira01.h"
#include "objects/object_spot11_obj/object_spot11_obj.h"
#define FLAGS 0x00000030
@@ -27,9 +28,6 @@ const ActorInit Bg_Tobira01_InitVars = {
(ActorFunc)BgTobira01_Draw,
};
extern Gfx D_06000088[];
extern CollisionHeader D_060011C0;
void BgTobira01_Open(BgTobira01* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
s16 cutsceneId = this->dyna.actor.cutscene;
@@ -80,7 +78,7 @@ void BgTobira01_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_060011C0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_spot11_obj_Colheader_0011C0);
gSaveContext.weekEventReg[88] &= (u8)~0x40;
Actor_SetScale(&this->dyna.actor, 1.0f);
this->timer2 = gSaveContext.isNight;
@@ -107,7 +105,7 @@ void BgTobira01_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06000088);
gSPDisplayList(POLY_OPA_DISP++, object_spot11_obj_DL_000088);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
src/overlays/actors/ovl_Boss_02/z_boss_02.c
+27 -48
View File
@@ -7,6 +7,8 @@
#include "z_boss_02.h"
#include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
#include "overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h"
#include "objects/object_boss02/object_boss02.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000035
@@ -29,36 +31,6 @@ void func_809DD2F8(GlobalContext* globalCtx);
void func_809DD934(Boss02* this, GlobalContext* globalCtx);
void func_809DEAC4(Boss02* this, GlobalContext* globalCtx);
extern Gfx D_06000230[];
extern Gfx D_060002E0[];
extern UNK_TYPE D_060003A0;
extern UNK_TYPE D_060041A0;
extern UNK_TYPE D_06008650;
extern SkeletonHeader D_06009B10;
extern AnimationHeader D_06009C78;
extern Gfx D_0600ECF0[];
extern Gfx D_0600EF90[];
extern Gfx D_0600F310[];
extern Gfx D_0600F690[];
extern Gfx D_0600FA10[];
extern Gfx D_0600FD90[];
extern Gfx D_06010110[];
extern Gfx D_06010490[];
extern Gfx D_06010810[];
extern Gfx D_06010B90[];
extern Gfx D_06010F10[];
extern Gfx D_06011290[];
extern Gfx D_06011610[];
extern Gfx D_06011990[];
extern Gfx D_06011D10[];
extern Gfx D_06012090[];
extern Gfx D_06012410[];
extern Gfx D_06012790[];
extern Gfx D_06012B10[];
extern Gfx D_06012E90[];
extern Gfx D_06013210[];
extern Gfx D_06013590[];
static u8 D_809E0420;
static u8 D_809E0421;
static u8 D_809E0422;
@@ -624,7 +596,8 @@ void Boss02_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.colChkInfo.mass = MASS_HEAVY;
this->actor.colChkInfo.health = 20;
Actor_SetScale(&this->actor, 0.01f);
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06009B10, &D_06009C78, this->jointTable, this->morphTable, 13);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_boss02_Skel_009B10, &object_boss02_Anim_009C78,
this->jointTable, this->morphTable, 13);
Collider_InitAndSetJntSph(globalCtx, &this->colliderSphere1, &this->actor, &sJntSphInit1,
this->colliderSphere1Elements);
Collider_InitAndSetJntSph(globalCtx, &this->colliderSphere2, &this->actor, &sJntSphInit2,
@@ -663,7 +636,7 @@ void func_809DAA98(Boss02* this, GlobalContext* globalCtx) {
void func_809DAAA8(Boss02* this, GlobalContext* globalCtx) {
this->actionFunc = func_809DAB78;
Animation_MorphToLoop(&this->skelAnime, &D_06009C78, 0.0f);
Animation_MorphToLoop(&this->skelAnime, &object_boss02_Anim_009C78, 0.0f);
if (D_809E042C->unk_1D20 != 0) {
this->unk_0144 = 10;
} else {
@@ -1351,9 +1324,12 @@ void func_809DC78C(Actor* thisx, GlobalContext* globalCtx) {
// matrix stuff at the start?
void Boss02_Draw(Actor* thisx, GlobalContext* globalCtx2) {
static Gfx* D_809DFA9C[] = {
D_0600ECF0, D_0600EF90, D_0600F310, D_0600F690, D_0600FA10, D_0600FD90, D_06010110, D_06010490,
D_06010810, D_06010B90, D_06010F10, D_06011290, D_06011610, D_06011990, D_06011D10, D_06012090,
D_06012410, D_06012790, D_06012B10, D_06012E90, D_06013210, D_06013590,
object_boss02_DL_00ECF0, object_boss02_DL_00EF90, object_boss02_DL_00F310, object_boss02_DL_00F690,
object_boss02_DL_00FA10, object_boss02_DL_00FD90, object_boss02_DL_010110, object_boss02_DL_010490,
object_boss02_DL_010810, object_boss02_DL_010B90, object_boss02_DL_010F10, object_boss02_DL_011290,
object_boss02_DL_011610, object_boss02_DL_011990, object_boss02_DL_011D10, object_boss02_DL_012090,
object_boss02_DL_012410, object_boss02_DL_012790, object_boss02_DL_012B10, object_boss02_DL_012E90,
object_boss02_DL_013210, object_boss02_DL_013590,
};
static Vec3f D_809DFAF4 = { -10000.0f, -100000.0f, -100000.0f };
Boss02* this = THIS;
@@ -1378,9 +1354,9 @@ void Boss02_Draw(Actor* thisx, GlobalContext* globalCtx2) {
func_8012C28C(globalCtx->state.gfxCtx);
if (this->actor.params == 0) {
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&D_060003A0));
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(object_boss02_Tex_0003A0));
} else {
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&D_060041A0));
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(object_boss02_Tex_0041A0));
}
gSPSegment(POLY_OPA_DISP++, 0x0D, matrix);
@@ -1490,9 +1466,12 @@ void Boss02_Draw(Actor* thisx, GlobalContext* globalCtx2) {
}
#else
static Gfx* D_809DFA9C[] = {
D_0600ECF0, D_0600EF90, D_0600F310, D_0600F690, D_0600FA10, D_0600FD90, D_06010110, D_06010490,
D_06010810, D_06010B90, D_06010F10, D_06011290, D_06011610, D_06011990, D_06011D10, D_06012090,
D_06012410, D_06012790, D_06012B10, D_06012E90, D_06013210, D_06013590,
object_boss02_DL_00ECF0, object_boss02_DL_00EF90, object_boss02_DL_00F310, object_boss02_DL_00F690,
object_boss02_DL_00FA10, object_boss02_DL_00FD90, object_boss02_DL_010110, object_boss02_DL_010490,
object_boss02_DL_010810, object_boss02_DL_010B90, object_boss02_DL_010F10, object_boss02_DL_011290,
object_boss02_DL_011610, object_boss02_DL_011990, object_boss02_DL_011D10, object_boss02_DL_012090,
object_boss02_DL_012410, object_boss02_DL_012790, object_boss02_DL_012B10, object_boss02_DL_012E90,
object_boss02_DL_013210, object_boss02_DL_013590,
};
static Vec3f D_809DFAF4 = { -10000.0f, -100000.0f, -100000.0f };
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_02/Boss02_Draw.s")
@@ -1562,7 +1541,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
for (i = 0; i < ARRAY_COUNT(D_809E0438); i++, effect++) {
if (effect->unk_24 == 1) {
if (!flag) {
gSPDisplayList(POLY_XLU_DISP++, D_06000230);
gSPDisplayList(POLY_XLU_DISP++, object_boss02_DL_000230);
gDPSetEnvColor(POLY_XLU_DISP++, 185, 140, 70, 128);
flag++;
}
@@ -1583,7 +1562,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_060002E0);
gSPDisplayList(POLY_XLU_DISP++, object_boss02_DL_0002E0);
}
}
@@ -1604,7 +1583,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_0401A620);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_01A620);
}
}
@@ -1612,7 +1591,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
for (i = 0, flag = false; i < ARRAY_COUNT(D_809E0438); i++, effect++) {
if (effect->unk_24 == 4) {
if (!flag) { //! @bug - dev forgot to set flag to 1, should only apply to first entry?
gSPDisplayList(POLY_XLU_DISP++, D_04023348);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_023348);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 128);
}
@@ -1624,7 +1603,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_04023428);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_023428);
}
}
@@ -1632,7 +1611,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
for (i = 0, flag = false; i < ARRAY_COUNT(D_809E0438); i++, effect++) {
if (effect->unk_24 == 2) {
if (!flag) {
gSPDisplayList(POLY_XLU_DISP++, D_06000230);
gSPDisplayList(POLY_XLU_DISP++, object_boss02_DL_000230);
gDPSetEnvColor(POLY_XLU_DISP++, 30, 30, 30, 128);
flag++;
}
@@ -1648,7 +1627,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_060002E0);
gSPDisplayList(POLY_XLU_DISP++, object_boss02_DL_0002E0);
}
}
@@ -2178,7 +2157,7 @@ void func_809DEAC4(Boss02* this, GlobalContext* globalCtx) {
if (this->unk_1D1C == (u32)(KREG(92) + 125)) {
TitleCard_InitBossName(&globalCtx->state, &globalCtx->actorCtx.titleCtxt,
Lib_SegmentedToVirtual(&D_06008650), 160, 180, 128, 40);
Lib_SegmentedToVirtual(object_boss02_Tex_008650), 160, 180, 128, 40);
}
if (this->unk_1D1C == (u32)(BREG(27) + 335)) {
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
+8 -10
View File
@@ -5,6 +5,8 @@
*/
#include "z_demo_kankyo.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_bubble/object_bubble.h"
#define FLAGS 0x00000030
@@ -17,10 +19,6 @@ void DemoKankyo_Draw(Actor* thisx, GlobalContext* globalCtx);
void DemoKakyo_MoonSparklesActionFunc(DemoKankyo* this, GlobalContext* globalCtx);
extern Gfx D_0407AB58[];
extern Gfx D_06001000[]; // the bubble display list used by shabom in giants type
extern Gfx D_04023428[];
static u8 sLostWoodsSparklesMutex = false; // make sure only one can exist at once
static s16 sLostWoodsSkyFishParticleNum = 0;
@@ -525,8 +523,8 @@ void DemoKakyo_DrawLostWoodsSparkle(Actor* thisx, GlobalContext* globalCtx2) {
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 20);
gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(&D_04079B10));
gSPDisplayList(POLY_XLU_DISP++, D_0407AB10);
gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_079B10));
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_07AB10);
for (i = 0; i < globalCtx->envCtx.unk_F2[3]; i++) {
worldPos.x = this->particles[i].posBase.x + this->particles[i].posOffset.x;
@@ -593,7 +591,7 @@ void DemoKakyo_DrawLostWoodsSparkle(Actor* thisx, GlobalContext* globalCtx2) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_0407AB58);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_07AB58);
}
}
@@ -657,7 +655,7 @@ void DemoKankyo_DrawMoonAndGiant(Actor* thisx, GlobalContext* globalCtx2) {
break;
}
gSPDisplayList(POLY_XLU_DISP++, &D_04023348);
gSPDisplayList(POLY_XLU_DISP++, &gameplay_keep_DL_023348);
Matrix_InsertMatrix(&globalCtx->billboardMtxF, MTXMODE_APPLY);
@@ -667,9 +665,9 @@ void DemoKankyo_DrawMoonAndGiant(Actor* thisx, GlobalContext* globalCtx2) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->actor.params == DEMO_KANKYO_TYPE_GIANTS) {
gSPDisplayList(POLY_XLU_DISP++, D_06001000);
gSPDisplayList(POLY_XLU_DISP++, object_bubble_DL_001000);
} else {
gSPDisplayList(POLY_XLU_DISP++, D_04023428);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_023428);
}
}
}
src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c
+28 -45
View File
@@ -5,6 +5,7 @@
*/
#include "z_dm_char07.h"
#include "objects/object_milkbar/object_milkbar.h"
#define FLAGS 0x00000030
@@ -29,24 +30,6 @@ const ActorInit Dm_Char07_InitVars = {
(ActorFunc)DmChar07_Draw,
};
extern Gfx D_06000100[];
extern Gfx D_06000240[];
extern Gfx D_06000650[];
extern Gfx D_06000790[];
extern Gfx D_06000B80[];
extern Gfx D_06000CC0[];
extern Gfx D_060010D0[];
extern Gfx D_06001210[];
extern Gfx D_060015E0[];
extern Gfx D_060016B8[];
extern Gfx D_06002BA0[];
extern Gfx D_06002CD0[];
extern CollisionHeader D_06006688;
extern Gfx D_060076A0[];
extern Gfx D_06007918[];
extern AnimatedMaterial D_060105F8;
extern Gfx D_06010D68[];
void DmChar07_SetupAction(DmChar07* this, DmChar07ActionFunc actionFunc) {
this->actionFunc = actionFunc;
}
@@ -62,7 +45,7 @@ void DmChar07_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->dyna.actor, 0.1f);
this->isStage = 1;
DynaPolyActor_Init(&this->dyna, 0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06006688);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_milkbar_Colheader_006688);
} else {
Actor_SetScale(&this->dyna.actor, 1.0f);
}
@@ -96,36 +79,36 @@ void DmChar07_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
switch (this->dyna.actor.params) {
case DMCHAR07_STAGE:
gSPDisplayList(POLY_OPA_DISP++, D_06002CD0);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_002CD0);
break;
case DMCHAR07_CREDITS_STAGE:
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_060105F8));
gSPDisplayList(POLY_OPA_DISP++, D_06007918);
gSPDisplayList(POLY_OPA_DISP++, D_06000240);
gSPDisplayList(POLY_OPA_DISP++, D_06000790);
gSPDisplayList(POLY_OPA_DISP++, D_06000CC0);
gSPDisplayList(POLY_OPA_DISP++, D_06001210);
gSPDisplayList(POLY_OPA_DISP++, D_060016B8);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_milkbar_Matanimheader_0105F8));
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_007918);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000240);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000790);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000CC0);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_001210);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_0016B8);
break;
case DMCHAR07_SPOTLIGHTS:
if (this->spotlightFlags & DMCHAR07_STAGE_RIGHT_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_06000240);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000240);
}
if (this->spotlightFlags & DMCHAR07_UPSTAGE_RIGHT_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_06000790);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000790);
}
if (this->spotlightFlags & DMCHAR07_STAGE_CENTER_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_06000CC0);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000CC0);
}
if (this->spotlightFlags & DMCHAR07_UPSTAGE_LEFT_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_06001210);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_001210);
}
if (this->spotlightFlags & DMCHAR07_DOWNSTAGE_CENTER_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_060016B8);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_0016B8);
}
break;
case DMCHAR07_DISHES:
gSPDisplayList(POLY_OPA_DISP++, D_06010D68);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_010D68);
break;
}
@@ -133,31 +116,31 @@ void DmChar07_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
switch (this->dyna.actor.params) {
case DMCHAR07_STAGE:
gSPDisplayList(POLY_XLU_DISP++, D_06002BA0);
gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_002BA0);
break;
case DMCHAR07_CREDITS_STAGE:
gSPDisplayList(POLY_XLU_DISP++, D_060076A0);
gSPDisplayList(POLY_XLU_DISP++, D_06000100);
gSPDisplayList(POLY_XLU_DISP++, D_06000650);
gSPDisplayList(POLY_XLU_DISP++, D_06000B80);
gSPDisplayList(POLY_XLU_DISP++, D_060010D0);
gSPDisplayList(POLY_XLU_DISP++, D_060015E0);
gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_0076A0);
gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_000100);
gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_000650);
gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_000B80);
gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_0010D0);
gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_0015E0);
break;
case DMCHAR07_SPOTLIGHTS:
if (this->spotlightFlags & DMCHAR07_STAGE_RIGHT_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_06000100);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000100);
}
if (this->spotlightFlags & DMCHAR07_UPSTAGE_RIGHT_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_06000650);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000650);
}
if (this->spotlightFlags & DMCHAR07_STAGE_CENTER_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_06000B80);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000B80);
}
if (this->spotlightFlags & DMCHAR07_UPSTAGE_LEFT_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_060010D0);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_0010D0);
}
if (this->spotlightFlags & DMCHAR07_DOWNSTAGE_CENTER_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_060015E0);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_0015E0);
}
break;
case DMCHAR07_DISHES:
src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c
+4 -5
View File
@@ -5,6 +5,7 @@
*/
#include "z_dm_nb.h"
#include "objects/object_nb/object_nb.h"
#define FLAGS 0x00000009
@@ -27,10 +28,7 @@ const ActorInit Dm_Nb_InitVars = {
(ActorFunc)DmNb_Draw,
};
extern AnimationHeader D_06000990;
extern FlexSkeletonHeader D_06008C40;
static ActorAnimationEntryS D_80C1E200[] = { &D_06000990, 1.0f, 0, -1, 0, 0 };
static ActorAnimationEntryS D_80C1E200[] = { &object_nb_Anim_000990, 1.0f, 0, -1, 0, 0 };
s32 func_80C1DED0(DmNb* this, s32 arg1) {
s32 ret = 0;
@@ -72,7 +70,8 @@ void DmNb_Init(Actor* thisx, GlobalContext* globalCtx) {
DmNb* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06008C40, NULL, this->jointTable, this->morphTable, 8);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_nb_Skel_008C40, NULL, this->jointTable, this->morphTable,
8);
this->unk1F0 = -1;
func_80C1DED0(this, 0);
this->actor.flags &= ~1;
src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c
+3 -5
View File
@@ -5,6 +5,7 @@
*/
#include "z_dm_sa.h"
#include "objects/object_stk/object_stk.h"
#define FLAGS 0x00000030
@@ -29,10 +30,7 @@ const ActorInit Dm_Sa_InitVars = {
(ActorFunc)DmSa_Draw,
};
extern FlexSkeletonHeader D_06013328;
extern AnimationHeader D_0600CC94;
static ActorAnimationEntry D_80A2ED00[] = { { &D_0600CC94, 1.0f, 0, -1.0f, 0, 0 } };
static ActorAnimationEntry D_80A2ED00[] = { { &object_stk_Anim_00CC94, 1.0f, 0, -1.0f, 0, 0 } };
void func_80A2E960(SkelAnime* arg0, ActorAnimationEntry* animations, u16 index) {
f32 frameCount;
@@ -54,7 +52,7 @@ void DmSa_Init(Actor* thisx, GlobalContext* globalCtx) {
this->alpha = 0xFF;
this->actor.targetArrowOffset = 3000.0f;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013328, NULL, NULL, NULL, 0);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_stk_Skel_013328, NULL, NULL, NULL, 0);
func_80A2E960(&this->skelAnime, D_80A2ED00, 0);
Actor_SetScale(&this->actor, 0.01f);
this->actionFunc = DmSa_DoNothing;
src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c
+3 -5
View File
@@ -5,6 +5,7 @@
*/
#include "z_dm_statue.h"
#include "objects/object_smtower/object_smtower.h"
#define FLAGS 0x04000030
@@ -27,9 +28,6 @@ const ActorInit Dm_Statue_InitVars = {
(ActorFunc)DmStatue_Draw,
};
extern AnimatedMaterial D_06001788;
extern Gfx D_06000520[];
void DmStatue_Init(Actor* thisx, GlobalContext* globalCtx) {
DmStatue* this = THIS;
@@ -43,6 +41,6 @@ void DmStatue_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void DmStatue_Draw(Actor* thisx, GlobalContext* globalCtx) {
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_06001788));
Gfx_DrawDListXlu(globalCtx, D_06000520);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_smtower_Matanimheader_001788));
Gfx_DrawDListXlu(globalCtx, object_smtower_DL_000520);
}
src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
+67 -154
View File
@@ -5,6 +5,9 @@
*/
#include "z_dm_stk.h"
#include "objects/object_stk/object_stk.h"
#include "objects/object_stk2/object_stk2.h"
#include "objects/object_stk3/object_stk3.h"
#define FLAGS 0x02000030
@@ -30,96 +33,6 @@ void func_80AA1C64(DmStk* this, GlobalContext* globalCtx);
void func_80AA2720(DmStk* this, GlobalContext* globalCtx);
void func_80AA27EC(DmStk* this, GlobalContext* globalCtx);
extern AnimationHeader D_0600055C;
extern AnimationHeader D_06001030;
extern AnimationHeader D_0600130C;
extern AnimationHeader D_06001374;
extern AnimationHeader D_06001EDC;
extern AnimationHeader D_06002774;
extern AnimationHeader D_06002CD8;
extern AnimationHeader D_06003068;
extern AnimationHeader D_060035C8;
extern AnimationHeader D_060039F0;
extern AnimationHeader D_06004554;
extern AnimationHeader D_06004580;
extern Gfx D_060046B0[];
extern AnimationHeader D_060049C8;
extern AnimationHeader D_060051C0;
extern Gfx D_060053C0[];
extern Gfx D_06005870[];
extern AnimationHeader D_06005F44;
extern Gfx D_06006BB0[];
extern AnimationHeader D_060070DC;
extern Gfx D_06007840[];
extern Gfx D_060079F0[];
extern Gfx D_060084C0[];
extern UNK_TYPE D_06008658;
extern Gfx D_060087B0[];
extern Gfx D_06008A80[];
extern Gfx D_060090C0[];
extern Gfx D_06009710[];
extern Gfx D_06009AC0[];
extern Gfx D_06009DA0[];
extern Gfx D_0600A530[];
extern Gfx D_0600A5C0[];
extern Gfx D_0600AE30[];
extern Gfx D_0600AEC0[];
extern AnimationHeader D_0600BB2C;
extern AnimationHeader D_0600C270;
extern AnimationHeader D_0600C964;
extern Gfx D_0600CAD0[];
extern AnimationHeader D_0600CBB8;
extern AnimationHeader D_0600D830;
extern AnimationHeader D_0600E6EC;
extern AnimationHeader D_0600EEC0;
extern AnimationHeader D_060101A4;
extern AnimationHeader D_06010B60;
extern AnimationHeader D_060110B4;
extern AnimationHeader D_06011FB0;
extern AnimationHeader D_06012A58;
extern FlexSkeletonHeader D_06013328;
extern AnimationHeader D_060141E4;
extern AnimationHeader D_06014920;
extern AnimationHeader D_06015028;
extern AnimationHeader D_06015C14;
extern AnimationHeader D_06016508;
extern Gfx D_06016620[];
extern AnimationHeader D_06016910;
extern AnimationHeader D_06018ED0;
extern AnimationHeader D_0601AA80;
extern AnimationHeader D_0601C114;
extern AnimationHeader D_0601C21C;
extern AnimationHeader D_0601D008;
extern AnimationHeader D_0601D07C;
extern AnimationHeader D_0601D3D0;
extern AnimationHeader D_0601DDE0;
extern AnimationHeader D_0601EF50;
extern AnimationHeader D_0601F9E4;
extern AnimationHeader D_06020CAC;
extern AnimationHeader D_0602200C;
extern AnimationHeader D_0602336C;
extern AnimationHeader D_060259F4;
extern AnimationHeader D_060266C8;
extern AnimationHeader D_06026CF4;
extern AnimationHeader D_06027CF4;
extern AnimationHeader D_06028F28;
extern AnimationHeader D_06029A04;
extern AnimationHeader D_0602A2D8;
extern AnimationHeader D_0602AD54;
extern AnimationHeader D_0602DC64;
extern AnimationHeader D_0602E9A0;
extern AnimationHeader D_0602FA70;
extern AnimationHeader D_0603021C;
extern AnimationHeader D_06031210;
extern AnimationHeader D_060322FC;
extern AnimationHeader D_06032AE0;
extern AnimationHeader D_0603323C;
extern AnimationHeader D_06034FD8;
extern AnimationHeader D_06036964;
extern AnimationHeader D_06037B94;
extern AnimationHeader D_0603967C;
extern AnimationHeader D_0603A8F8;
const ActorInit Dm_Stk_InitVars = {
ACTOR_DM_STK,
ACTORCAT_ITEMACTION,
@@ -190,42 +103,42 @@ static DamageTable sDamageTable = {
};
static ActorAnimationEntry sAnimations[] = {
{ &D_0601C21C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_0601D3D0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06001030, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0601D008, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0601D008, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_06015C14, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_060070DC, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_0600D830, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0600055C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0600130C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0600C270, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0600CBB8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0601AA80, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0601D07C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06016910, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06018ED0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0601DDE0, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0601EF50, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0602DC64, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0602E9A0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0602DC64, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0602E9A0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_060035C8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_060049C8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_060259F4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_060266C8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06026CF4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0601C114, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &D_06004580, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06020CAC, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0602200C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0602336C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06002774, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06003068, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_060101A4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06010B60, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0602A2D8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0601F9E4, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &D_06029A04, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_0602AD54, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &D_0600BB2C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0600C964, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_060110B4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06011FB0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06012A58, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_060141E4, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0600E6EC, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0600EEC0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06027CF4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06028F28, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0603323C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_06031210, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_060322FC, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06032AE0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0603021C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_06036964, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &D_06016508, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06015028, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06014920, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0602FA70, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06037B94, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0603967C, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &D_0603967C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0603A8F8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06034FD8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06005F44, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06002CD8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_060039F0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06004554, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_060051C0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06001374, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06001EDC, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk_Anim_01C21C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk_Anim_01D3D0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk_Anim_001030, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk_Anim_01D008, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk_Anim_01D008, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk_Anim_015C14, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_0070DC, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk2_Anim_00D830, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_00055C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_00130C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_00C270, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_00CBB8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_01AA80, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_01D07C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_016910, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_018ED0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_01DDE0, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_01EF50, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_02DC64, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_02E9A0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_02DC64, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_02E9A0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_0035C8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_0049C8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_0259F4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_0266C8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_026CF4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_01C114, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &object_stk2_Anim_004580, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_020CAC, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_02200C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_02336C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk_Anim_002774, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk_Anim_003068, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_0101A4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_010B60, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_02A2D8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_01F9E4, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &object_stk2_Anim_029A04, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk2_Anim_02AD54, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &object_stk_Anim_00BB2C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk_Anim_00C964, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_0110B4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_011FB0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_012A58, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_0141E4, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_00E6EC, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_00EEC0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_027CF4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_028F28, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_03323C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk2_Anim_031210, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_0322FC, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_032AE0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_03021C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk2_Anim_036964, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &object_stk_Anim_016508, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk_Anim_015028, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk_Anim_014920, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_02FA70, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_037B94, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_03967C, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &object_stk2_Anim_03967C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_03A8F8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_034FD8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk3_Anim_005F44, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk3_Anim_002CD8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk3_Anim_0039F0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk3_Anim_004554, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk3_Anim_0051C0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk3_Anim_001374, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk3_Anim_001EDC, 1.0f, 0.0f, -1.0f, 0, 0.0f },
};
void func_80A9FDB0(DmStk* this, GlobalContext* globalCtx) {
@@ -965,7 +878,7 @@ void DmStk_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.targetArrowOffset = 1100.0f;
this->unk_334 = 99;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013328, NULL, NULL, NULL, 0);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_stk_Skel_013328, NULL, NULL, NULL, 0);
func_80A9FE3C(this, globalCtx, &this->skelAnime, &sAnimations[this->unk_2E0], 0);
}
@@ -1680,11 +1593,11 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if ((this->unk_2E0 == 69) || (this->unk_2E0 == 11) || (this->unk_2E0 == 71)) {
gSPDisplayList(POLY_OPA_DISP++, D_0600AEC0);
gSPDisplayList(POLY_OPA_DISP++, D_0600AE30);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00AEC0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00AE30);
} else {
gSPDisplayList(POLY_OPA_DISP++, D_0600A5C0);
gSPDisplayList(POLY_OPA_DISP++, D_0600A530);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00A5C0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00A530);
}
switch (this->unk_32C) {
@@ -1699,16 +1612,16 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
}
POLY_OPA_DISP = Gfx_SetFog(POLY_OPA_DISP, this->unk_2E8, this->unk_2EC, this->unk_2F0,
this->unk_2F4, this->unk_2F8, this->unk_2FC);
gSPDisplayList(POLY_OPA_DISP++, D_06006BB0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_006BB0);
POLY_OPA_DISP = func_801660B8(globalCtx, POLY_OPA_DISP);
} else {
gSPDisplayList(POLY_OPA_DISP++, D_06006BB0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_006BB0);
}
break;
case 2:
gSPDisplayList(POLY_OPA_DISP++, D_06006BB0);
gSPDisplayList(POLY_OPA_DISP++, D_06005870);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_006BB0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_005870);
if (func_800EE29C(globalCtx, 0x201) &&
(globalCtx->csCtx.npcActions[func_800EE200(globalCtx, 0x201)]->unk0 == 2) && (this->unk_337 >= 0)) {
@@ -1718,8 +1631,8 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->unk_337].segment);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_06008658));
Gfx_DrawDListOpa(globalCtx, D_06007840);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_stk2_Matanimheader_008658));
Gfx_DrawDListOpa(globalCtx, object_stk2_DL_007840);
gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->unk_336].segment);
gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->unk_336].segment);
@@ -1742,20 +1655,20 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
switch (this->unk_32D) {
case 0:
gSPDisplayList(POLY_OPA_DISP++, D_06009AC0);
gSPDisplayList(POLY_OPA_DISP++, D_060046B0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_009AC0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0046B0);
break;
case 1:
gSPDisplayList(POLY_OPA_DISP++, D_06009710);
gSPDisplayList(POLY_OPA_DISP++, D_060053C0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_009710);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0053C0);
break;
case 3:
gSPDisplayList(POLY_OPA_DISP++, D_06009DA0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_009DA0);
if ((globalCtx->sceneNum == SCENE_LOST_WOODS) && (gSaveContext.sceneSetupIndex == 1)) {
gSPDisplayList(POLY_OPA_DISP++, D_0600CAD0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00CAD0);
}
break;
@@ -1766,7 +1679,7 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06006BB0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_006BB0);
break;
}
@@ -1783,33 +1696,33 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
break;
case 1:
gSPDisplayList(POLY_OPA_DISP++, D_060084C0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0084C0);
break;
case 2:
gSPDisplayList(POLY_OPA_DISP++, D_060090C0);
gSPDisplayList(POLY_OPA_DISP++, D_060079F0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0090C0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0079F0);
break;
case 3:
if ((globalCtx->sceneNum != SCENE_LOST_WOODS) || (gSaveContext.sceneSetupIndex != 1)) {
gSPDisplayList(POLY_OPA_DISP++, D_0600CAD0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00CAD0);
}
gSPDisplayList(POLY_OPA_DISP++, D_060090C0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0090C0);
break;
case 4:
gSPDisplayList(POLY_OPA_DISP++, D_060090C0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0090C0);
break;
case 6:
gSPDisplayList(POLY_OPA_DISP++, D_06008A80);
gSPDisplayList(POLY_OPA_DISP++, D_06016620);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_008A80);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_016620);
break;
case 9:
if (this->unk_2E4 == 255) {
gSPDisplayList(POLY_OPA_DISP++, D_060087B0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0087B0);
}
break;
}
@@ -1829,7 +1742,7 @@ void DmStk_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (this->unk_33B != 0) {
if (this->actor.params == 1) {
Gfx_DrawDListOpa(globalCtx, D_06006BB0);
Gfx_DrawDListOpa(globalCtx, object_stk_DL_006BB0);
return;
}
src/overlays/actors/ovl_Door_Ana/z_door_ana.c
+2 -1
View File
@@ -5,6 +5,7 @@
*/
#include "z_door_ana.h"
#include "objects/gameplay_field_keep/gameplay_field_keep.h"
#define FLAGS 0x02000000
@@ -208,5 +209,5 @@ void DoorAna_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void DoorAna_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListXlu(globalCtx, D_05000C40);
Gfx_DrawDListXlu(globalCtx, gameplay_field_keep_DL_000C40);
}
src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c
+14 -21
View File
@@ -5,6 +5,12 @@
*/
#include "z_door_spiral.h"
#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
#include "objects/object_numa_obj/object_numa_obj.h"
#include "objects/object_hakugin_obj/object_hakugin_obj.h"
#include "objects/object_ikana_obj/object_ikana_obj.h"
#include "objects/object_ikninside_obj/object_ikninside_obj.h"
#include "objects/object_danpei_object/object_danpei_object.h"
#define FLAGS 0x00000010
@@ -77,29 +83,16 @@ const ActorInit Door_Spiral_InitVars = {
(ActorFunc)DoorSpiral_Draw,
};
extern Gfx D_06000590[];
extern Gfx D_060007A8[];
extern Gfx D_06000EA0[];
extern Gfx D_060012C0[];
extern Gfx D_060014C8[];
extern Gfx D_06002110[];
extern Gfx D_06004448[];
extern Gfx D_060051B8[];
extern Gfx D_06006128[];
extern Gfx D_06009278[];
extern Gfx D_06012B70[];
extern Gfx D_06013EA8[];
// Parameters for each staircase, indexed with SpiralType
static SpiralInfo sSpiralInfo[] = {
{ { NULL, NULL }, 0, 130, 12, 50, 15 }, // SPIRAL_OVERWORLD
{ { D_050219E0, D_0501D980 }, 0, 130, 12, 50, 15 }, // SPIRAL_DUNGEON
{ { D_06004448, D_060007A8 }, 0, 130, 12, 50, 15 }, // SPIRAL_WOODFALL_TEMPLE
{ { D_060051B8, D_060014C8 }, 0, 130, 12, 50, 15 }, // SPIRAL_WOODFALL_TEMPLE_ALT
{ { D_06009278, D_06006128 }, 0, 130, 12, 50, 15 }, // SPIRAL_SNOWHEAD_TEMPLE
{ { D_06013EA8, D_06012B70 }, 0, 130, 12, 50, 15 }, // SPIRAL_STONE_TOWER
{ { D_06000EA0, D_06000590 }, 0, 130, 12, 50, 15 }, // SPIRAL_IKANA_CASTLE
{ { D_06002110, D_060012C0 }, 0, 130, 12, 50, 15 }, // SPIRAL_DAMPES_HOUSE
{ { NULL, NULL }, 0, 130, 12, 50, 15 }, // SPIRAL_OVERWORLD
{ { gameplay_dangeon_keep_DL_0219E0, gameplay_dangeon_keep_DL_01D980 }, 0, 130, 12, 50, 15 }, // SPIRAL_DUNGEON
{ { object_numa_obj_DL_004448, object_numa_obj_DL_0007A8 }, 0, 130, 12, 50, 15 }, // SPIRAL_WOODFALL_TEMPLE
{ { object_numa_obj_DL_0051B8, object_numa_obj_DL_0014C8 }, 0, 130, 12, 50, 15 }, // SPIRAL_WOODFALL_TEMPLE_ALT
{ { object_hakugin_obj_DL_009278, object_hakugin_obj_DL_006128 }, 0, 130, 12, 50, 15 }, // SPIRAL_SNOWHEAD_TEMPLE
{ { object_ikana_obj_DL_013EA8, object_ikana_obj_DL_012B70 }, 0, 130, 12, 50, 15 }, // SPIRAL_STONE_TOWER
{ { object_ikninside_obj_DL_000EA0, object_ikninside_obj_DL_000590 }, 0, 130, 12, 50, 15 }, // SPIRAL_IKANA_CASTLE
{ { object_danpei_object_DL_002110, object_danpei_object_DL_0012C0 }, 0, 130, 12, 50, 15 }, // SPIRAL_DAMPES_HOUSE
};
// Defines which object bank a staircase should use, and its index to `sSpiralInfo`
src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+3 -3
View File
@@ -1035,7 +1035,7 @@ void func_808BB4F4(DoorWarp1* this, GlobalContext* globalCtx2) {
Matrix_InsertTranslation(this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y + this->unk_1A4,
this->dyna.actor.world.pos.z, MTXMODE_NEW);
Matrix_Scale(4.0f, this->unk_1AC, 4.0f, MTXMODE_APPLY);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_warp1_Matanimheader_0044D8));
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_warp1_Matanimheader_0044D8));
Gfx_DrawDListXlu(globalCtx, object_warp1_DL_003230);
return;
}
@@ -1054,7 +1054,7 @@ void func_808BB4F4(DoorWarp1* this, GlobalContext* globalCtx2) {
MTXMODE_NEW);
Matrix_RotateY(this->dyna.actor.world.rot.y, MTXMODE_APPLY);
Matrix_Scale(1.0f, this->unk_1A8, 1.0f, MTXMODE_APPLY);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_warp1_Matanimheader_0057D8));
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_warp1_Matanimheader_0057D8));
OPEN_DISPS(globalCtx->state.gfxCtx);
@@ -1066,7 +1066,7 @@ void func_808BB4F4(DoorWarp1* this, GlobalContext* globalCtx2) {
gSPDisplayList(POLY_XLU_DISP++, object_warp1_DL_004690);
gfxCtx = globalCtx->state.gfxCtx;
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_warp1_Matanimheader_007238));
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_warp1_Matanimheader_007238));
Matrix_InsertTranslation(this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z,
MTXMODE_NEW);
Matrix_RotateY(this->dyna.actor.world.rot.y, MTXMODE_APPLY);
src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
+3 -2
View File
@@ -5,6 +5,7 @@
*/
#include "z_eff_dust.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "system_malloc.h"
#define FLAGS 0x00000030
@@ -295,7 +296,7 @@ void func_80919768(Actor* thisx, GlobalContext* globalCtx2) {
gSPClearGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING);
gSPDisplayList(POLY_XLU_DISP++, D_04054A90);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_054A90);
gSPSetGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING);
}
@@ -351,7 +352,7 @@ void func_809199FC(Actor* thisx, GlobalContext* globalCtx2) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPClearGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING);
gSPDisplayList(POLY_XLU_DISP++, D_04054A90);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_054A90);
gSPSetGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING);
}
src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
+3 -3
View File
@@ -980,9 +980,9 @@ s32 EnAob01_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
Actor* thisx) {
EnAob01* this = THIS;
TexturePtr sp38[] = {
&object_aob_Tex_000658,
&object_aob_Tex_000E58,
&object_aob_Tex_001658,
object_aob_Tex_000658,
object_aob_Tex_000E58,
object_aob_Tex_001658,
};
if (limbIndex == 15) {
src/overlays/actors/ovl_En_Baisen/z_en_baisen.c
+4 -7
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_baisen.h"
#include "objects/object_bai/object_bai.h"
#define FLAGS 0x00000009
@@ -22,11 +23,6 @@ void func_80BE895C(EnBaisen* this, GlobalContext* globalCtx);
void func_80BE8AAC(EnBaisen* this, GlobalContext* globalCtx);
void func_80BE89D8(EnBaisen* this, GlobalContext* globalCtx);
extern FlexSkeletonHeader D_06007908;
extern AnimationHeader D_060011C0;
extern AnimationHeader D_060008B4;
extern AnimationHeader D_06008198;
const ActorInit En_Baisen_InitVars = {
ACTOR_EN_BAISEN,
ACTORCAT_NPC,
@@ -61,7 +57,7 @@ static ColliderCylinderInit sCylinderInit = {
static u16 sTextIds[] = { 0x2ABD, 0x2ABB, 0x2AD5, 0x2AD6, 0x2AD7, 0x2AD8, 0x2AC6 };
static AnimationHeader* D_80BE8E4C[] = { &D_060011C0, &D_060008B4, &D_06008198 };
static AnimationHeader* D_80BE8E4C[] = { &object_bai_Anim_0011C0, &object_bai_Anim_0008B4, &object_bai_Anim_008198 };
static u8 animModes[] = { 0, 0 };
@@ -69,7 +65,8 @@ void EnBaisen_Init(Actor* thisx, GlobalContext* globalCtx) {
EnBaisen* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007908, &D_060011C0, this->jointTable, this->morphTable, 20);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_bai_Skel_007908, &object_bai_Anim_0011C0, this->jointTable,
this->morphTable, 20);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
this->paramCopy = this->actor.params;
if (this->actor.params == 0) {
src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
+2 -1
View File
@@ -7,6 +7,7 @@
#include "z_en_bigslime.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
#include "objects/object_bigslime/object_bigslime.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000235
@@ -3099,7 +3100,7 @@ void EnBigslime_DrawGekko(Actor* thisx, GlobalContext* globalCtx) {
func_800AE5A0(globalCtx);
}
EnBigslime_SetSysMatrix(&gekkoPos, globalCtx, D_04076BC0, this->gekkoScale * (550.0f / 7.0f),
EnBigslime_SetSysMatrix(&gekkoPos, globalCtx, gCircleShadowDL, this->gekkoScale * (550.0f / 7.0f),
this->gekkoScale * (550.0f / 7.0f), 0.0f, 0, 255.0f);
if (this->minislimeState != MINISLIME_INACTIVE_STATE) {
src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
+8 -16
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_bji_01.h"
#include "objects/object_bji/object_bji.h"
#define FLAGS 0x00000019
@@ -30,15 +31,6 @@ s32 EnBji01_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
Actor* thisx);
void EnBji01_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx);
extern AnimationHeader D_06000FDC;
extern AnimationHeader D_06005B58;
extern AnimationHeader D_06000AB0;
extern AnimationHeader D_0600066C;
extern void* D_060049F0[];
extern void* D_06004E70[];
extern void* D_06005270[];
extern FlexSkeletonHeader D_0600578C;
const ActorInit En_Bji_01_InitVars = {
ACTOR_EN_BJI_01,
ACTORCAT_NPC,
@@ -73,10 +65,10 @@ static ColliderCylinderInit sCylinderInit = {
/* Animations struct */
static struct_80B8E1A8 D_809CDC7C[] = {
{ &D_06000FDC, 1.0f, 0, 0.0f }, /* Looking through telescope */
{ &D_06005B58, 1.0f, 0, 10.0f }, /* Breathing? Unused? */
{ &D_06000AB0, 1.0f, 0, 0.0f }, /* Talking */
{ &D_0600066C, 1.0f, 2, -5.0f }, /* Scratching chin? */
{ &object_bji_Anim_000FDC, 1.0f, 0, 0.0f }, /* Looking through telescope */
{ &object_bji_Anim_005B58, 1.0f, 0, 10.0f }, /* Breathing? Unused? */
{ &object_bji_Anim_000AB0, 1.0f, 0, 0.0f }, /* Talking */
{ &object_bji_Anim_00066C, 1.0f, 2, -5.0f }, /* Scratching chin? */
};
void func_809CCDE0(EnBji01* this, GlobalContext* globalCtx) {
@@ -339,8 +331,8 @@ void EnBji01_Init(Actor* thisx, GlobalContext* globalCtx) {
EnBji01* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600578C, &D_06000FDC, this->jointTable, this->morphTable,
BJI_LIMB_MAX);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_bji_Skel_00578C, &object_bji_Anim_000FDC, this->jointTable,
this->morphTable, BJI_LIMB_MAX);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
@@ -442,7 +434,7 @@ void EnBji01_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
}
void EnBji01_Draw(Actor* thisx, GlobalContext* globalCtx) {
static TexturePtr sEyeTextures[] = { D_060049F0, D_06004E70, D_06005270 };
static TexturePtr sEyeTextures[] = { object_bji_Tex_0049F0, object_bji_Tex_004E70, object_bji_Tex_005270 };
EnBji01* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx);
src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c
+4 -5
View File
@@ -1101,13 +1101,12 @@ void EnBomjima_Draw(Actor* thisx, GlobalContext* globalCtx) {
gEnBomjima_D_80C00B18, gEnBomjima_D_80C00B18,
};
static TexturePtr D_80C00B3C[] = {
&object_cs_Tex_00C520,
&object_cs_Tex_00CD20,
&object_cs_Tex_00D520,
object_cs_Tex_00C520,
object_cs_Tex_00CD20,
object_cs_Tex_00D520,
};
static TexturePtr D_80C00B48[] = {
&object_cs_Tex_00E620, &object_cs_Tex_00EA20, &object_cs_Tex_00EE20,
&object_cs_Tex_00DD20, &object_cs_Tex_00F220,
object_cs_Tex_00E620, object_cs_Tex_00EA20, object_cs_Tex_00EE20, object_cs_Tex_00DD20, object_cs_Tex_00F220,
};
EnBomjima* this = THIS;
src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c
+4 -5
View File
@@ -897,13 +897,12 @@ void EnBomjimb_Draw(Actor* thisx, GlobalContext* globalCtx) {
gEnBomjimb_D_80C03250, gEnBomjimb_D_80C03250,
};
static TexturePtr D_80C03274[] = {
&object_cs_Tex_00C520,
&object_cs_Tex_00CD20,
&object_cs_Tex_00D520,
object_cs_Tex_00C520,
object_cs_Tex_00CD20,
object_cs_Tex_00D520,
};
static TexturePtr D_80C03280[] = {
&object_cs_Tex_00E620, &object_cs_Tex_00EA20, &object_cs_Tex_00EE20,
&object_cs_Tex_00DD20, &object_cs_Tex_00F220,
object_cs_Tex_00E620, object_cs_Tex_00EA20, object_cs_Tex_00EE20, object_cs_Tex_00DD20, object_cs_Tex_00F220,
};
EnBomjimb* this = THIS;
src/overlays/actors/ovl_En_Cha/z_en_cha.c
+3 -5
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_cha.h"
#include "objects/object_cha/object_cha.h"
#define FLAGS 0x00000000
@@ -49,9 +50,6 @@ static ColliderCylinderInit sCylinderInit = {
{ 10, 40, 0, { 0, 0, 0 } },
};
extern Gfx D_06000710[];
extern Gfx D_06000958[];
void EnCha_Init(Actor* thisx, GlobalContext* globalCtx) {
EnCha* this = THIS;
s32 pad;
@@ -117,8 +115,8 @@ void EnCha_Update(Actor* thisx, GlobalContext* globalCtx2) {
void EnCha_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnCha* this = THIS;
Gfx_DrawDListOpa(globalCtx, D_06000710);
Gfx_DrawDListOpa(globalCtx, object_cha_DL_000710);
Matrix_InsertTranslation(-1094.0f, 4950.0f, 9.0f, MTXMODE_APPLY);
Matrix_InsertXRotation_s(this->actor.home.rot.x, MTXMODE_APPLY);
Gfx_DrawDListOpa(globalCtx, D_06000958);
Gfx_DrawDListOpa(globalCtx, object_cha_DL_000958);
}
src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
+15 -4
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_clear_tag.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000035
@@ -81,8 +82,18 @@ static f32 sLightRayMaxScale[] = {
25.0f, 100.0f, 48.0f, 20.0f, 32.0f,
};
static Gfx* sSplashTex[] = {
D_040378F0, D_04037DF0, D_040382F0, D_040387F0, D_04038CF0, D_040391F0, D_040396F0, D_04039BF0, NULL, NULL, NULL,
static TexturePtr sSplashTex[] = {
gExplosionSplashTex1,
gExplosionSplashTex2,
gExplosionSplashTex3,
gExplosionSplashTex4,
gExplosionSplashTex5,
gExplosionSplashTex6,
gExplosionSplashTex7,
gExplosionSplashTex8,
NULL,
NULL,
NULL,
};
#include "overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.c"
@@ -820,7 +831,7 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
Matrix_SetCurrentState(&mtxF);
Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_04030100);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_030100);
}
}
}
@@ -986,7 +997,7 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateStateAroundXAxis(effect->rotationX);
Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_0403A0F0);
gSPDisplayList(POLY_XLU_DISP++, gExplosionSplashDL);
}
}
}
src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c
+2 -2
View File
@@ -246,7 +246,7 @@ void func_80AFE4AC(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
POLY_OPA_DISP = func_801660B8(globalCtx, POLY_OPA_DISP);
POLY_OPA_DISP = func_8012C724(POLY_OPA_DISP);
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&gameplay_keep_Tex_05E6F0));
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_05E6F0));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_05F6F0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
@@ -268,7 +268,7 @@ void func_80AFE650(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
POLY_OPA_DISP = func_801660B8(globalCtx, POLY_OPA_DISP);
POLY_OPA_DISP = func_8012C724(POLY_OPA_DISP);
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&gameplay_keep_Tex_05CEF0));
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_05CEF0));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_05F6F0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
src/overlays/actors/ovl_En_Cow/z_en_cow.c
+19 -25
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_cow.h"
#include "objects/object_cow/object_cow.h"
#define FLAGS 0x00000009
@@ -61,13 +62,6 @@ static ColliderCylinderInit sCylinderInit = {
Vec3f D_8099D63C = { 0.0f, -1300.0f, 1100.0f };
extern AnimationHeader D_060001CC; // gCowBodyChewAnim
extern FlexSkeletonHeader D_06004010; // gCowBodySkel
extern AnimationHeader D_06004264; // gCowBodyMoveHeadAnim
extern AnimationHeader D_06004348; // gCowTailIdleAnim
extern FlexSkeletonHeader D_06004C30; // gCowTailSkel
extern AnimationHeader D_06004E98; // gCowTailSwishAnim
void EnCow_RotatePoint(Vec3f* vec, s16 angle) {
f32 x = (Math_CosS(angle) * vec->x) + (Math_SinS(angle) * vec->z);
@@ -113,9 +107,9 @@ void EnCow_Init(Actor* thisx, GlobalContext* globalCtx) {
switch (EN_COW_TYPE(thisx)) {
case EN_COW_TYPE_DEFAULT:
case EN_COW_TYPE_ABDUCTED:
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004010, NULL, this->jointTable, this->morphTable,
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCowBodySkel, NULL, this->jointTable, this->morphTable,
COW_LIMB_MAX);
Animation_PlayLoop(&this->skelAnime, &D_060001CC);
Animation_PlayLoop(&this->skelAnime, &gCowBodyChewAnim);
Collider_InitAndSetCylinder(globalCtx, &this->colliders[0], &this->actor, &sCylinderInit);
Collider_InitAndSetCylinder(globalCtx, &this->colliders[1], &this->actor, &sCylinderInit);
@@ -141,9 +135,9 @@ void EnCow_Init(Actor* thisx, GlobalContext* globalCtx) {
func_801A5080(4);
break;
case EN_COW_TYPE_TAIL:
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004C30, NULL, this->jointTable, this->morphTable,
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCowTailSkel, NULL, this->jointTable, this->morphTable,
COW_LIMB_MAX);
Animation_PlayLoop(&this->skelAnime, &D_06004348);
Animation_PlayLoop(&this->skelAnime, &gCowTailIdleAnim);
this->actor.update = EnCow_UpdateTail;
this->actor.draw = EnCow_DrawTail;
@@ -177,13 +171,13 @@ void EnCow_UpdateAnimation(EnCow* this, GlobalContext* globalCtx) {
this->animationTimer--;
} else {
this->animationTimer = Rand_ZeroFloat(500.0f) + 40.0f;
Animation_Change(&this->skelAnime, &D_060001CC, 1.0f, this->skelAnime.curFrame,
Animation_GetLastFrame(&D_060001CC), ANIMMODE_ONCE, 1.0f);
Animation_Change(&this->skelAnime, &gCowBodyChewAnim, 1.0f, this->skelAnime.curFrame,
Animation_GetLastFrame(&gCowBodyChewAnim), ANIMMODE_ONCE, 1.0f);
}
if (this->actor.xzDistToPlayer < 150.0f) {
if (!(this->flags & EN_COW_FLAG_PLAYER_HAS_APPROACHED)) {
this->flags |= EN_COW_FLAG_PLAYER_HAS_APPROACHED;
if (this->skelAnime.animation == &D_060001CC) {
if (this->skelAnime.animation == &gCowBodyChewAnim) {
this->animationTimer = 0;
}
}
@@ -320,15 +314,15 @@ void EnCow_DoTail(EnCow* this, GlobalContext* globalCtx) {
this->animationTimer--;
} else {
this->animationTimer = Rand_ZeroFloat(200.0f) + 40.0f;
Animation_Change(&this->skelAnime, &D_06004348, 1.0f, this->skelAnime.curFrame,
Animation_GetLastFrame(&D_06004348), ANIMMODE_ONCE, 1.0f);
Animation_Change(&this->skelAnime, &gCowTailIdleAnim, 1.0f, this->skelAnime.curFrame,
Animation_GetLastFrame(&gCowTailIdleAnim), ANIMMODE_ONCE, 1.0f);
}
if (this->actor.xzDistToPlayer < 150.0f &&
ABS_ALT((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) > 25000) {
if (!(this->flags & EN_COW_FLAG_PLAYER_HAS_APPROACHED)) {
this->flags |= EN_COW_FLAG_PLAYER_HAS_APPROACHED;
if (this->skelAnime.animation == &D_06004348) {
if (this->skelAnime.animation == &gCowTailIdleAnim) {
this->animationTimer = 0;
}
}
@@ -350,12 +344,12 @@ void EnCow_Update(Actor* thisx, GlobalContext* globalCtx2) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
if (SkelAnime_Update(&this->skelAnime)) {
if (this->skelAnime.animation == &D_060001CC) {
if (this->skelAnime.animation == &gCowBodyChewAnim) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_COW_CRY);
Animation_Change(&this->skelAnime, &D_06004264, 1.0f, 0.0f, Animation_GetLastFrame(&D_06004264),
ANIMMODE_ONCE, 1.0f);
Animation_Change(&this->skelAnime, &gCowBodyMoveHeadAnim, 1.0f, 0.0f,
Animation_GetLastFrame(&gCowBodyMoveHeadAnim), ANIMMODE_ONCE, 1.0f);
} else {
Animation_Change(&this->skelAnime, &D_060001CC, 1.0f, 0.0f, Animation_GetLastFrame(&D_060001CC),
Animation_Change(&this->skelAnime, &gCowBodyChewAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gCowBodyChewAnim),
ANIMMODE_LOOP, 1.0f);
}
}
@@ -391,11 +385,11 @@ void EnCow_UpdateTail(Actor* thisx, GlobalContext* globalCtx) {
EnCow* this = THIS;
if (SkelAnime_Update(&this->skelAnime)) {
if (this->skelAnime.animation == &D_06004348) {
Animation_Change(&this->skelAnime, &D_06004E98, 1.0f, 0.0f, Animation_GetLastFrame(&D_06004E98),
ANIMMODE_ONCE, 1.0f);
if (this->skelAnime.animation == &gCowTailIdleAnim) {
Animation_Change(&this->skelAnime, &gCowTailSwishAnim, 1.0f, 0.0f,
Animation_GetLastFrame(&gCowTailSwishAnim), ANIMMODE_ONCE, 1.0f);
} else {
Animation_Change(&this->skelAnime, &D_06004348, 1.0f, 0.0f, Animation_GetLastFrame(&D_06004348),
Animation_Change(&this->skelAnime, &gCowTailIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gCowTailIdleAnim),
ANIMMODE_LOOP, 1.0f);
}
}
src/overlays/actors/ovl_En_Dai/z_en_dai.c
+19 -32
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_dai.h"
#include "objects/object_dai/object_dai.h"
#define FLAGS 0x02000039
@@ -18,24 +19,6 @@ void EnDai_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80B3F00C(EnDai* this, GlobalContext* globalCtx);
void func_80B3EF90(EnDai* this, GlobalContext* globalCtx);
extern AnimationHeader D_060107B0;
extern AnimationHeader D_06010FB0;
extern AnimationHeader D_060117B0;
extern AnimationHeader D_06010FB0;
extern AnimationHeader D_06011FB0;
extern AnimationHeader D_060127B0;
extern AnimationHeader D_060079E4;
extern AnimationHeader D_06007354;
extern AnimationHeader D_06000CEC;
extern AnimationHeader D_060069DC;
extern AnimationHeader D_0600563C;
extern AnimationHeader D_06002E58;
extern AnimationHeader D_06006590;
extern FlexSkeletonHeader D_060130D0;
extern Gfx D_06000230[];
extern Gfx D_060002E8[];
extern Gfx D_0600C538[];
const ActorInit En_Dai_InitVars = {
ACTOR_EN_DAI,
ACTORCAT_NPC,
@@ -87,7 +70,7 @@ void func_80B3E168(EnDaiParticle* particle, GlobalContext* globalCtx2) {
gDPPipeSync(POLY_XLU_DISP++);
if (!isDisplayListSet) {
gSPDisplayList(POLY_XLU_DISP++, D_06000230);
gSPDisplayList(POLY_XLU_DISP++, object_dai_DL_000230);
isDisplayListSet = true;
}
@@ -108,7 +91,7 @@ void func_80B3E168(EnDaiParticle* particle, GlobalContext* globalCtx2) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_060002E8);
gSPDisplayList(POLY_XLU_DISP++, object_dai_DL_0002E8);
Matrix_StatePop();
}
@@ -148,9 +131,11 @@ s32 func_80B3E5B4(EnDai* this, GlobalContext* globalCtx) {
s32 func_80B3E5DC(EnDai* this, s32 arg1) {
static ActorAnimationEntryS D_80B3FBFC[] = {
{ &D_060079E4, 1.0f, 0, -1, 0, 0 }, { &D_060079E4, 1.0f, 0, -1, 0, -4 }, { &D_06007354, 1.0f, 0, -1, 2, -4 },
{ &D_06000CEC, 1.0f, 0, -1, 2, -4 }, { &D_060069DC, 1.0f, 0, -1, 2, -4 }, { &D_0600563C, 1.0f, 0, -1, 2, 0 },
{ &D_0600563C, 1.0f, 0, -1, 2, -4 }, { &D_06002E58, 1.0f, 0, -1, 0, -4 }, { &D_06006590, 1.0f, 0, -1, 2, -4 },
{ &object_dai_Anim_0079E4, 1.0f, 0, -1, 0, 0 }, { &object_dai_Anim_0079E4, 1.0f, 0, -1, 0, -4 },
{ &object_dai_Anim_007354, 1.0f, 0, -1, 2, -4 }, { &object_dai_Anim_000CEC, 1.0f, 0, -1, 2, -4 },
{ &object_dai_Anim_0069DC, 1.0f, 0, -1, 2, -4 }, { &object_dai_Anim_00563C, 1.0f, 0, -1, 2, 0 },
{ &object_dai_Anim_00563C, 1.0f, 0, -1, 2, -4 }, { &object_dai_Anim_002E58, 1.0f, 0, -1, 0, -4 },
{ &object_dai_Anim_006590, 1.0f, 0, -1, 2, -4 },
};
s32 phi_v1 = false;
@@ -526,7 +511,8 @@ void EnDai_Init(Actor* thisx, GlobalContext* globalCtx) {
EnDai* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 0.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060130D0, NULL, this->jointTable, this->morphTable, 19);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dai_Skel_0130D0, NULL, this->jointTable, this->morphTable,
19);
this->unk_A70 = -1;
func_80B3E5DC(this, 0);
Actor_SetScale(&this->actor, 0.2f);
@@ -647,10 +633,10 @@ void EnDai_TransformLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* thi
}
void func_80B3F78C(EnDai* this, GlobalContext* globalCtx) {
static AnimationHeader* D_80B3FE58[] = {
&D_060107B0, &D_06010FB0, &D_060117B0, &D_06010FB0, &D_06011FB0, &D_060127B0,
static TexturePtr D_80B3FE58[] = {
object_dai_Tex_0107B0, object_dai_Tex_010FB0, object_dai_Tex_0117B0,
object_dai_Tex_010FB0, object_dai_Tex_011FB0, object_dai_Tex_0127B0,
};
s32 pad;
if (globalCtx->actorCtx.unkB != 0) {
@@ -676,7 +662,7 @@ void func_80B3F78C(EnDai* this, GlobalContext* globalCtx) {
Matrix_SetCurrentState(&this->unk_18C);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_0600C538);
gSPDisplayList(POLY_XLU_DISP++, object_dai_DL_00C538);
}
func_80B3E5B4(this, globalCtx);
@@ -685,8 +671,9 @@ void func_80B3F78C(EnDai* this, GlobalContext* globalCtx) {
}
void func_80B3F920(EnDai* this, GlobalContext* globalCtx) {
static AnimationHeader* D_80B3FE70[] = {
&D_060107B0, &D_06010FB0, &D_060117B0, &D_06010FB0, &D_06011FB0, &D_060127B0,
static TexturePtr D_80B3FE70[] = {
object_dai_Tex_0107B0, object_dai_Tex_010FB0, object_dai_Tex_0117B0,
object_dai_Tex_010FB0, object_dai_Tex_011FB0, object_dai_Tex_0127B0,
};
s32 pad;
@@ -707,7 +694,7 @@ void func_80B3F920(EnDai* this, GlobalContext* globalCtx) {
Matrix_SetCurrentState(&this->unk_18C);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_0600C538);
gSPDisplayList(POLY_OPA_DISP++, object_dai_DL_00C538);
CLOSE_DISPS(globalCtx->state.gfxCtx);
} else {
@@ -726,7 +713,7 @@ void func_80B3F920(EnDai* this, GlobalContext* globalCtx) {
Matrix_SetCurrentState(&this->unk_18C);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_0600C538);
gSPDisplayList(POLY_XLU_DISP++, object_dai_DL_00C538);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
+17 -26
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_daiku.h"
#include "objects/object_daiku/object_daiku.h"
#define FLAGS 0x00000009
@@ -20,22 +21,6 @@ void func_80943BC0(EnDaiku* this);
void func_80943BDC(EnDaiku* this, GlobalContext* globalCtx);
void func_809438F8(EnDaiku* this, GlobalContext* globalCtx);
extern AnimationHeader D_06000600;
extern AnimationHeader D_06000C44;
extern AnimationHeader D_06001114;
extern AnimationHeader D_06002FA0;
extern FlexSkeletonHeader D_0600A850;
extern AnimationHeader D_0600ACD0;
extern AnimationHeader D_0600B690;
extern AnimationHeader D_0600BEAC;
extern AnimationHeader D_0600C234;
extern AnimationHeader D_0600C92C;
extern Gfx D_06006D70[];
extern Gfx D_06006E80[];
extern Gfx D_06006FB0[];
extern Gfx D_060070C0[];
extern Gfx D_06008EC8[];
const ActorInit En_Daiku_InitVars = {
ACTOR_EN_DAIKU,
ACTORCAT_NPC,
@@ -108,18 +93,18 @@ void EnDaiku_Init(Actor* thisx, GlobalContext* globalCtx) {
this->unk_27E = this->unk_278 * 4 + 4;
case ENDAIKU_PARAMS_FF_1:
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600A850, &D_06002FA0, this->jointTable,
this->morphTable, 17);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_002FA0,
this->jointTable, this->morphTable, 17);
break;
case ENDAIKU_PARAMS_FF_2:
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600A850, &D_0600B690, this->jointTable,
this->morphTable, 17);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_00B690,
this->jointTable, this->morphTable, 17);
break;
case ENDAIKU_PARAMS_FF_3:
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600A850, &D_06001114, this->jointTable,
this->morphTable, 17);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_001114,
this->jointTable, this->morphTable, 17);
break;
}
@@ -134,8 +119,9 @@ void EnDaiku_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void func_8094373C(EnDaiku* this, s32 arg1) {
static AnimationHeader* D_809440A4[] = {
&D_06002FA0, &D_0600ACD0, &D_0600C92C, &D_06000C44, &D_0600C234,
&D_06000600, &D_06001114, &D_0600B690, &D_0600BEAC,
&object_daiku_Anim_002FA0, &object_daiku_Anim_00ACD0, &object_daiku_Anim_00C92C,
&object_daiku_Anim_000C44, &object_daiku_Anim_00C234, &object_daiku_Anim_000600,
&object_daiku_Anim_001114, &object_daiku_Anim_00B690, &object_daiku_Anim_00BEAC,
};
static u8 D_809440C8[] = {
0, 0, 0, 0, 2, 0, 0, 2, 2,
@@ -309,7 +295,12 @@ s32 EnDaiku_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
}
void EnDaiku_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
static Gfx* D_809440D4[] = { D_060070C0, D_06006FB0, D_06006E80, D_06006D70 };
static Gfx* D_809440D4[] = {
object_daiku_DL_0070C0,
object_daiku_DL_006FB0,
object_daiku_DL_006E80,
object_daiku_DL_006D70,
};
EnDaiku* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx);
@@ -319,7 +310,7 @@ void EnDaiku_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
}
if ((this->unk_278 == ENDAIKU_PARAMS_FF_3) && (limbIndex == 8)) {
gSPDisplayList(POLY_OPA_DISP++, D_06008EC8);
gSPDisplayList(POLY_OPA_DISP++, object_daiku_DL_008EC8);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c
+12 -24
View File
@@ -6,6 +6,8 @@
#include "z_en_daiku2.h"
#include "overlays/actors/ovl_En_Bom/z_en_bom.h"
#include "objects/object_daiku/object_daiku.h"
#include "objects/object_bombiwa/object_bombiwa.h"
#define FLAGS 0x00000009
@@ -30,22 +32,6 @@ void func_80BE71D8(EnDaiku2* this, GlobalContext* globalCtx);
void func_80BE7504(EnDaiku2* this, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3, f32 arg4, s16 arg5);
void func_80BE7718(EnDaiku2* this, GlobalContext* globalCtx);
extern AnimationHeader D_06002134;
extern AnimationHeader D_06002FA0;
extern AnimationHeader D_0600ACD0;
extern AnimationHeader D_0600C92C;
extern AnimationHeader D_06000C44;
extern AnimationHeader D_0600C234;
extern AnimationHeader D_06000600;
extern AnimationHeader D_06001114;
extern AnimationHeader D_0600B690;
extern AnimationHeader D_06001A24;
extern AnimationHeader D_0600D328;
extern FlexSkeletonHeader D_0600A850;
extern Gfx D_06009638[];
extern Gfx D_0600A390[];
extern Gfx D_060009E0[];
const ActorInit En_Daiku2_InitVars = {
ACTOR_EN_DAIKU2,
ACTORCAT_NPC,
@@ -96,7 +82,8 @@ void EnDaiku2_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 40.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600A850, &D_06002FA0, this->jointTable, this->morphTable, 17);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_002FA0,
this->jointTable, this->morphTable, 17);
this->actor.targetMode = 0;
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
this->unk_278 = ENDAIKU2_GET_7F(&this->actor);
@@ -135,8 +122,9 @@ void EnDaiku2_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void func_80BE6408(EnDaiku2* this, s32 arg1) {
static AnimationHeader* sAnimations[] = {
&D_06002FA0, &D_0600ACD0, &D_0600C92C, &D_06000C44, &D_0600C234, &D_06000600,
&D_06001114, &D_0600B690, &D_06001A24, &D_06002134, &D_0600D328,
&object_daiku_Anim_002FA0, &object_daiku_Anim_00ACD0, &object_daiku_Anim_00C92C, &object_daiku_Anim_000C44,
&object_daiku_Anim_00C234, &object_daiku_Anim_000600, &object_daiku_Anim_001114, &object_daiku_Anim_00B690,
&object_daiku_Anim_001A24, &object_daiku_Anim_002134, &object_daiku_Anim_00D328,
};
static u8 D_80BE7958[] = {
0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0,
@@ -274,8 +262,8 @@ void func_80BE66E4(EnDaiku2* this, GlobalContext* globalCtx) {
if ((this->unk_276 == 5) || (this->unk_276 == 9)) {
func_80BE6408(this, 10);
} else if ((this->unk_276 == 10) && (this->unk_284 <= sp9C)) {
this->unk_284 = Animation_GetLastFrame(&D_06002134);
Animation_Change(&this->skelAnime, &D_06002134, -1.0f, this->unk_284, 0.0f, 2, -4.0f);
this->unk_284 = Animation_GetLastFrame(&object_daiku_Anim_002134);
Animation_Change(&this->skelAnime, &object_daiku_Anim_002134, -1.0f, this->unk_284, 0.0f, 2, -4.0f);
this->unk_276 = 11;
} else if ((this->unk_276 == 11) && (sp9C <= 0.0f)) {
func_80BE6408(this, 8);
@@ -479,11 +467,11 @@ void EnDaiku2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
if (limbIndex == 14) {
Matrix_Scale(this->unk_260, this->unk_260, this->unk_260, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06009638);
gSPDisplayList(POLY_OPA_DISP++, object_daiku_DL_009638);
}
if (limbIndex == 15) {
gSPDisplayList(POLY_OPA_DISP++, D_0600A390);
gSPDisplayList(POLY_OPA_DISP++, object_daiku_DL_00A390);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
@@ -569,7 +557,7 @@ void func_80BE7718(EnDaiku2* this, GlobalContext* globalCtx) {
Matrix_Scale(particle->unk_30, particle->unk_30, particle->unk_30, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_060009E0);
gSPDisplayList(POLY_OPA_DISP++, object_bombiwa_DL_0009E0);
Matrix_StatePop();
}
src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
+20 -31
View File
@@ -6,6 +6,7 @@
#include "z_en_dekunuts.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
#include "objects/object_dekunuts/object_dekunuts.h"
#define FLAGS 0x00000005
@@ -38,20 +39,6 @@ void func_808BE4D4(EnDekunuts* this, GlobalContext* globalCtx);
void func_808BE680(EnDekunuts* this);
void func_808BE6C4(EnDekunuts* this, GlobalContext* globalCtx);
extern AnimationHeader D_06000168;
extern Gfx D_06001E50[];
extern Gfx D_06001F50[];
extern SkeletonHeader D_06002468;
extern AnimationHeader D_0600259C;
extern AnimationHeader D_06002A5C;
extern AnimationHeader D_06002BD4;
extern AnimationHeader D_06002DD4;
extern AnimationHeader D_06002FA4;
extern AnimationHeader D_06003180;
extern AnimationHeader D_0600326C;
extern AnimationHeader D_060033E4;
extern AnimationHeader D_06003780;
const ActorInit En_Dekunuts_InitVars = {
ACTOR_EN_DEKUNUTS,
ACTORCAT_ENEMY,
@@ -132,7 +119,8 @@ void EnDekunuts_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 35.0f);
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06002468, &D_0600326C, this->jointTable, this->morphTable, 10);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_dekunuts_Skel_002468, &object_dekunuts_Anim_00326C,
this->jointTable, this->morphTable, 10);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
this->unk_194 = ENDEKUNUTS_GET_FF00(&this->actor);
@@ -178,7 +166,7 @@ void func_808BD3B4(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BD428(EnDekunuts* this) {
Animation_PlayOnceSetSpeed(&this->skelAnime, &D_06003180, 0.0f);
Animation_PlayOnceSetSpeed(&this->skelAnime, &object_dekunuts_Anim_003180, 0.0f);
this->unk_190 = Rand_S16Offset(100, 50);
this->collider.dim.height = 5;
Math_Vec3f_Copy(&this->actor.world.pos, &this->actor.home.pos);
@@ -233,7 +221,7 @@ void func_808BD49C(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BD78C(EnDekunuts* this) {
Animation_PlayLoop(&this->skelAnime, &D_06002FA4);
Animation_PlayLoop(&this->skelAnime, &object_dekunuts_Anim_002FA4);
this->unk_190 = 2;
this->actionFunc = func_808BD7D4;
}
@@ -253,7 +241,7 @@ void func_808BD7D4(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BD870(EnDekunuts* this) {
Animation_MorphToLoop(&this->skelAnime, &D_0600326C, -3.0f);
Animation_MorphToLoop(&this->skelAnime, &object_dekunuts_Anim_00326C, -3.0f);
if (this->actionFunc == func_808BDA4C) {
this->unk_190 = 4098;
} else {
@@ -292,7 +280,7 @@ void func_808BD8D8(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BDA08(EnDekunuts* this) {
Animation_PlayOnce(&this->skelAnime, &D_06000168);
Animation_PlayOnce(&this->skelAnime, &object_dekunuts_Anim_000168);
this->unk_190 = this->unk_194;
this->actionFunc = func_808BDA4C;
}
@@ -336,7 +324,7 @@ void func_808BDA4C(EnDekunuts* this, GlobalContext* globalCtx) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_THROW);
}
} else if ((this->unk_190 >= 2) && Animation_OnFrame(&this->skelAnime, 12.0f)) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06000168, -3.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dekunuts_Anim_000168, -3.0f);
if (this->unk_190 != 0) {
this->unk_190--;
}
@@ -344,14 +332,14 @@ void func_808BDA4C(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BDC9C(EnDekunuts* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06002A5C, -5.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dekunuts_Anim_002A5C, -5.0f);
this->unk_190 = 0;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN);
this->actionFunc = func_808BDD54;
}
void func_808BDCF0(EnDekunuts* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06002A5C, -5.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dekunuts_Anim_002A5C, -5.0f);
this->collider.base.acFlags &= ~AC_ON;
this->unk_190 = 80;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN);
@@ -379,7 +367,7 @@ void func_808BDD54(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BDE7C(EnDekunuts* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06002DD4, -3.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dekunuts_Anim_002DD4, -3.0f);
this->collider.dim.height = 37;
this->actor.colChkInfo.mass = 50;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DAMAGE);
@@ -399,7 +387,7 @@ void func_808BDEF8(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BDF60(EnDekunuts* this) {
Animation_PlayLoop(&this->skelAnime, &D_06003780);
Animation_PlayLoop(&this->skelAnime, &object_dekunuts_Anim_003780);
this->unk_190 = 2;
this->unk_18C = 0;
this->collider.base.acFlags |= AC_ON;
@@ -456,7 +444,7 @@ void func_808BDFB8(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BE1CC(EnDekunuts* this) {
Animation_PlayLoop(&this->skelAnime, &D_060033E4);
Animation_PlayLoop(&this->skelAnime, &object_dekunuts_Anim_0033E4);
this->unk_190 = 3;
this->actor.speedXZ = 0.0f;
if (this->unk_18D != 0) {
@@ -479,7 +467,7 @@ void func_808BE22C(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BE294(EnDekunuts* this, s32 arg1) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_0600259C, -3.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dekunuts_Anim_00259C, -3.0f);
if (this->actor.params == ENDEKUNUTS_GET_FF00_0) {
this->actor.speedXZ = 10.0f;
if (arg1 != 0) {
@@ -492,7 +480,7 @@ void func_808BE294(EnDekunuts* this, s32 arg1) {
this->actionFunc = func_808BE358;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DAMAGE);
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_CUTBODY);
Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, Animation_GetLastFrame(&D_0600259C));
Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, Animation_GetLastFrame(&object_dekunuts_Anim_00259C));
}
void func_808BE358(EnDekunuts* this, GlobalContext* globalCtx) {
@@ -531,7 +519,7 @@ void func_808BE3FC(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BE484(EnDekunuts* this) {
Animation_PlayOnce(&this->skelAnime, &D_06002BD4);
Animation_PlayOnce(&this->skelAnime, &object_dekunuts_Anim_002BD4);
this->actionFunc = func_808BE4D4;
this->actor.speedXZ = 0.0f;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DEAD);
@@ -554,13 +542,14 @@ void func_808BE4D4(EnDekunuts* this, GlobalContext* globalCtx) {
Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.world.pos, 0xE0);
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_OBJ_ETCETERA, this->actor.home.pos.x, this->actor.home.pos.y,
this->actor.home.pos.z, 0, this->actor.home.rot.y, 0, 0x80);
EffectSsHahen_SpawnBurst(globalCtx, &this->actor.home.pos, 6.0f, 0, 6, 2, 15, 64, 10, D_06001F50);
EffectSsHahen_SpawnBurst(globalCtx, &this->actor.home.pos, 6.0f, 0, 6, 2, 15, 64, 10,
object_dekunuts_DL_001F50);
Actor_MarkForDeath(&this->actor);
}
}
void func_808BE680(EnDekunuts* this) {
Animation_MorphToLoop(&this->skelAnime, &D_0600326C, -3.0f);
Animation_MorphToLoop(&this->skelAnime, &object_dekunuts_Anim_00326C, -3.0f);
this->actionFunc = func_808BE6C4;
}
@@ -748,7 +737,7 @@ void EnDekunuts_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (this->actor.colorFilterTimer != 0) {
func_800AE5A0(globalCtx);
}
Gfx_DrawDListOpa(globalCtx, D_06001E50);
Gfx_DrawDListOpa(globalCtx, object_dekunuts_DL_001E50);
func_800BE680(globalCtx, &this->actor, this->unk_21C, 8, this->unk_214, this->unk_218, this->unk_210,
this->unk_18E);
}
src/overlays/actors/ovl_En_Dg/z_en_dg.c
+11 -18
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_dg.h"
#include "objects/object_dog/object_dog.h"
#define FLAGS 0x00800019
@@ -36,17 +37,6 @@ void func_8098BB10(EnDg* this, GlobalContext* globalCtx);
void func_8098BBEC(EnDg* this, GlobalContext* globalCtx);
void func_8098BC54(EnDg* this, GlobalContext* globalCtx);
extern AnimationHeader D_06000998;
extern AnimationHeader D_06001048;
extern AnimationHeader D_06001348;
extern AnimationHeader D_06001560;
extern AnimationHeader D_060017C0;
extern AnimationHeader D_06001A84;
extern AnimationHeader D_06001BD8;
extern AnimationHeader D_06001FB0;
extern AnimationHeader D_060021C8;
extern FlexSkeletonHeader D_060080F0;
const ActorInit En_Dg_InitVars = {
ACTOR_EN_DG,
ACTORCAT_ENEMY,
@@ -140,12 +130,14 @@ static DamageTable sDamageTable = {
};
static ActorAnimationEntryS sAnimations[] = {
{ &D_060021C8, 1.0f, 0, -1, 0, 0 }, { &D_060021C8, 1.0f, 0, -1, 0, -6 }, { &D_06001BD8, 1.0f, 0, -1, 0, 0 },
{ &D_06000998, 1.0f, 0, -1, 0, -6 }, { &D_06001FB0, 1.0f, 0, -1, 2, -6 }, { &D_06001FB0, 1.0f, 0, -1, 4, -6 },
{ &D_06001048, 1.0f, 0, -1, 2, -6 }, { &D_06001348, 1.0f, 0, -1, 0, -6 }, { &D_06001048, 1.0f, 0, 27, 2, -6 },
{ &D_06001048, 1.0f, 28, -1, 2, -6 }, { &D_06001048, 1.0f, 54, 54, 2, -6 }, { &D_060021C8, -1.5f, -1, 0, 0, -6 },
{ &D_06001560, 1.0f, 0, -1, 2, 0 }, { &D_06001A84, 1.2f, 0, -1, 2, 0 }, { &D_060017C0, 1.2f, 0, -1, 2, 0 },
{ &D_060021C8, 0.5f, 0, -1, 0, 0 },
{ &object_dog_Anim_0021C8, 1.0f, 0, -1, 0, 0 }, { &object_dog_Anim_0021C8, 1.0f, 0, -1, 0, -6 },
{ &object_dog_Anim_001BD8, 1.0f, 0, -1, 0, 0 }, { &object_dog_Anim_000998, 1.0f, 0, -1, 0, -6 },
{ &object_dog_Anim_001FB0, 1.0f, 0, -1, 2, -6 }, { &object_dog_Anim_001FB0, 1.0f, 0, -1, 4, -6 },
{ &object_dog_Anim_001048, 1.0f, 0, -1, 2, -6 }, { &object_dog_Anim_001348, 1.0f, 0, -1, 0, -6 },
{ &object_dog_Anim_001048, 1.0f, 0, 27, 2, -6 }, { &object_dog_Anim_001048, 1.0f, 28, -1, 2, -6 },
{ &object_dog_Anim_001048, 1.0f, 54, 54, 2, -6 }, { &object_dog_Anim_0021C8, -1.5f, -1, 0, 0, -6 },
{ &object_dog_Anim_001560, 1.0f, 0, -1, 2, 0 }, { &object_dog_Anim_001A84, 1.2f, 0, -1, 2, 0 },
{ &object_dog_Anim_0017C0, 1.2f, 0, -1, 2, 0 }, { &object_dog_Anim_0021C8, 0.5f, 0, -1, 0, 0 },
};
static InitChainEntry sInitChain[] = {
@@ -1116,7 +1108,8 @@ void EnDg_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060080F0, NULL, this->jointTable, this->morphTable, 13);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dog_Skel_0080F0, NULL, this->jointTable, this->morphTable,
13);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c
+33 -48
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_dinofos.h"
#include "objects/object_dinofos/object_dinofos.h"
#define FLAGS 0x00000435
@@ -56,25 +57,6 @@ void func_8089C398(EnDinofos* this);
void func_8089C164(EnDinofos* this);
void func_8089C244(EnDinofos* this);
extern FlexSkeletonHeader D_06009570;
extern AnimationHeader D_06002E40;
extern AnimationHeader D_060025B4;
extern AnimationHeader D_06000580;
extern AnimationHeader D_06001CCC;
extern AnimationHeader D_0600ABD0;
extern AnimationHeader D_0600D62C;
extern AnimationHeader D_06001040;
extern AnimationHeader D_060013C0;
extern AnimationHeader D_060017B8;
extern AnimationHeader D_0600C974;
extern AnimationHeader D_06009B70;
extern AnimationHeader D_06000AF0;
extern AnimationHeader D_0600D21C;
extern Gfx D_06008E30[];
extern Gfx D_06009030[];
extern Gfx D_06009230[];
extern Gfx D_06009030[];
const ActorInit En_Dinofos_InitVars = {
ACTOR_EN_DINOFOS,
ACTORCAT_ENEMY,
@@ -259,11 +241,11 @@ static DamageTable sDamageTable = {
static CollisionCheckInfoInit sColChkInfoInit = { 4, 40, 100, 80 };
static Gfx* D_8089E33C[] = {
D_06008E30,
D_06009030,
D_06009230,
D_06009030,
static TexturePtr D_8089E33C[] = {
object_dinofos_Tex_008E30,
object_dinofos_Tex_009030,
object_dinofos_Tex_009230,
object_dinofos_Tex_009030,
};
static s16 D_8089E34C = -1;
@@ -293,7 +275,8 @@ void EnDinofos_Init(Actor* thisx, GlobalContext* globalCtx) {
this->colliderJntSphElement);
Collider_InitAndSetQuad(globalCtx, &this->colliderQuad, &this->actor, &sQuadInit);
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06009570, &D_06002E40, this->jointTable, this->morphTable, 21);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dinofos_Skel_009570, &object_dinofos_Anim_002E40,
this->jointTable, this->morphTable, 21);
if (D_8089E364 == 0) {
for (i = 0; i < ARRAY_COUNT(D_8089E33C); i++) {
@@ -483,8 +466,9 @@ void func_8089B100(EnDinofos* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
Vec3f sp3C;
Animation_Change(&this->skelAnime, &D_06001CCC, 1.0f, Animation_GetLastFrame(&D_06001CCC),
Animation_GetLastFrame(&D_06001CCC), 2, 0.0f);
Animation_Change(&this->skelAnime, &object_dinofos_Anim_001CCC, 1.0f,
Animation_GetLastFrame(&object_dinofos_Anim_001CCC),
Animation_GetLastFrame(&object_dinofos_Anim_001CCC), 2, 0.0f);
func_800BE33C(&camera->eye, &camera->at, &this->unk_29A, true);
Math_Vec3f_Diff(&this->actor.world.pos, &player->actor.world.pos, &sp3C);
this->unk_2BC.x = player->actor.world.pos.x + (0.4f * sp3C.x);
@@ -549,7 +533,7 @@ void func_8089B4A4(EnDinofos* this) {
if (this->unk_290 < 10) {
func_801A2E54(NA_BGM_MINI_BOSS);
}
Animation_PlayOnce(&this->skelAnime, &D_0600C974);
Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_00C974);
this->unk_2BC.x = (Math_SinS(this->actor.shape.rot.y + 0x200) * 123.0f) + this->actor.world.pos.x;
this->unk_2BC.y = this->actor.floorHeight + 11.0f;
this->unk_2BC.z = (Math_CosS(this->actor.shape.rot.y + 0x200) * 123.0f) + this->actor.world.pos.z;
@@ -589,7 +573,7 @@ void func_8089B580(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089B6E8(EnDinofos* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06009B70, -3.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dinofos_Anim_009B70, -3.0f);
this->actionFunc = func_8089B72C;
}
@@ -607,7 +591,7 @@ void func_8089B72C(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089B7B0(EnDinofos* this) {
Animation_MorphToLoop(&this->skelAnime, &D_06002E40, -4.0f);
Animation_MorphToLoop(&this->skelAnime, &object_dinofos_Anim_002E40, -4.0f);
this->unk_290 = (s32)Rand_ZeroFloat(20.0f) + 40;
this->unk_292 = 30;
this->actor.speedXZ = 0.0f;
@@ -635,7 +619,7 @@ void func_8089B8B0(EnDinofos* this, GlobalContext* globalCtx) {
f32 phi_f0;
if (this->actionFunc != func_8089B98C) {
Animation_MorphToLoop(&this->skelAnime, &D_06000580, -4.0f);
Animation_MorphToLoop(&this->skelAnime, &object_dinofos_Anim_000580, -4.0f);
if (Actor_OtherIsTargeted(globalCtx, &this->actor)) {
phi_f0 = 170.0f;
} else {
@@ -690,7 +674,7 @@ void func_8089B98C(EnDinofos* this, GlobalContext* globalCtx) {
void func_8089BAC0(EnDinofos* this) {
if (this->actionFunc != func_8089BB60) {
Animation_MorphToLoop(&this->skelAnime, &D_06000580, -4.0f);
Animation_MorphToLoop(&this->skelAnime, &object_dinofos_Anim_000580, -4.0f);
this->actor.speedXZ = 0.0f;
}
if (BINANG_SUB(this->actor.yawTowardsPlayer, this->actor.shape.rot.y) > 0) {
@@ -731,8 +715,8 @@ void func_8089BBB4(EnDinofos* this, GlobalContext* globalCtx) {
if (this->actionFunc == func_8089D1E0) {
this->skelAnime.playSpeed = this->actor.speedXZ * 0.166666671634f;
} else {
Animation_Change(&this->skelAnime, &D_0600D62C, this->actor.speedXZ * 0.166666671634f, 0.0f, 0.0f, 0,
-4.0f);
Animation_Change(&this->skelAnime, &object_dinofos_Anim_00D62C, this->actor.speedXZ * 0.166666671634f, 0.0f,
0.0f, 0, -4.0f);
}
this->actor.world.rot.y = BINANG_ADD(this->actor.shape.rot.y, 0x4000);
@@ -811,10 +795,10 @@ void func_8089BD28(EnDinofos* this, GlobalContext* globalCtx) {
void func_8089C024(EnDinofos* this, s32 arg1) {
if (arg1 == 0) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06001CCC, 2.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dinofos_Anim_001CCC, 2.0f);
func_8089AD70(this);
} else {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06001CCC, -1.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dinofos_Anim_001CCC, -1.0f);
if ((arg1 == 2) || (arg1 == 3)) {
this->colliderJntSph.base.acFlags &= ~AC_ON;
func_8089AD70(this);
@@ -878,10 +862,10 @@ void func_8089C2A8(EnDinofos* this, GlobalContext* globalCtx) {
SkelAnime_Update(&this->skelAnime);
this->unk_290++;
Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 0x1800);
if ((this->actor.velocity.y < 0.0f) && (this->skelAnime.animation == &D_06001CCC)) {
if ((this->actor.velocity.y < 0.0f) && (this->skelAnime.animation == &object_dinofos_Anim_001CCC)) {
this->colliderQuad.base.atFlags |= AT_ON;
this->colliderJntSph.base.acFlags |= AC_ON;
Animation_Change(&this->skelAnime, &D_060025B4, 1.0f, 7.0f, 13.0f, 2, -2.0f);
Animation_Change(&this->skelAnime, &object_dinofos_Anim_0025B4, 1.0f, 7.0f, 13.0f, 2, -2.0f);
}
if (this->actor.bgCheckFlags & 1) {
@@ -892,9 +876,9 @@ void func_8089C2A8(EnDinofos* this, GlobalContext* globalCtx) {
void func_8089C398(EnDinofos* this) {
if (this->actionFunc != func_8089C2A8) {
Animation_PlayOnce(&this->skelAnime, &D_06000AF0);
Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_000AF0);
} else {
this->skelAnime.endFrame = Animation_GetLastFrame(&D_060025B4);
this->skelAnime.endFrame = Animation_GetLastFrame(&object_dinofos_Anim_0025B4);
}
if (this->actor.speedXZ < 0.0f) {
@@ -921,7 +905,7 @@ void func_8089C44C(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089C4F8(EnDinofos* this) {
Animation_PlayOnce(&this->skelAnime, &D_060025B4);
Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_0025B4);
this->colliderQuad.base.atFlags &= ~AT_BOUNCED;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_CRY);
this->unk_290 = 0;
@@ -952,7 +936,7 @@ void func_8089C56C(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089C690(EnDinofos* this) {
Animation_Change(&this->skelAnime, &D_060025B4, -1.0f, this->skelAnime.curFrame, 0.0f, 2, 0.0f);
Animation_Change(&this->skelAnime, &object_dinofos_Anim_0025B4, -1.0f, this->skelAnime.curFrame, 0.0f, 2, 0.0f);
this->colliderQuad.base.atFlags &= ~(AT_ON | AT_BOUNCED);
if (this->actionFunc != func_8089C2A8) {
this->actor.world.rot.y = this->actor.shape.rot.y;
@@ -1002,7 +986,7 @@ void func_8089C7B8(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089C87C(EnDinofos* this, s32 arg1) {
Animation_PlayOnce(&this->skelAnime, &D_0600D21C);
Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_00D21C);
func_800BE5CC(&this->actor, &this->colliderJntSph, arg1);
this->actor.shape.rot.y = BINANG_ROT180(this->actor.world.rot.y);
this->actor.speedXZ = 10.0f;
@@ -1035,7 +1019,7 @@ void func_8089C938(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089CA14(EnDinofos* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06001040, -5.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dinofos_Anim_001040, -5.0f);
this->colliderJntSph.base.acFlags |= AC_ON;
this->actor.speedXZ = 0.0f;
this->actor.world.rot.y = this->actor.shape.rot.y;
@@ -1056,7 +1040,7 @@ void func_8089CB10(EnDinofos* this, GlobalContext* globalCtx) {
s32 i;
Sphere16* worldSphere;
Animation_PlayLoop(&this->skelAnime, &D_060013C0);
Animation_PlayLoop(&this->skelAnime, &object_dinofos_Anim_0013C0);
this->unk_290 = 20;
this->actor.speedXZ = 0.0f;
this->colliderJntSph.base.atFlags |= AT_ON;
@@ -1128,7 +1112,7 @@ void func_8089CBEC(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089CF00(EnDinofos* this, GlobalContext* globalCtx) {
Animation_PlayOnce(&this->skelAnime, &D_060017B8);
Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_0017B8);
this->colliderJntSph.base.atFlags &= ~AT_ON;
if (globalCtx->sceneNum == SCENE_MITURIN) {
globalCtx->envCtx.unk_C3 = 255;
@@ -1143,7 +1127,7 @@ void func_8089CF70(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089CFAC(EnDinofos* this) {
Animation_PlayOnce(&this->skelAnime, &D_0600ABD0);
Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_00ABD0);
this->actor.flags &= ~1;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_DEAD);
this->actor.speedXZ = 0.0f;
@@ -1183,7 +1167,8 @@ void func_8089D11C(EnDinofos* this, s16 arg1) {
} else {
this->actor.speedXZ = 15.0f;
}
Animation_Change(&this->skelAnime, &D_0600D62C, this->actor.speedXZ * (1.0f / 7.5f), 0.0f, 0.0f, 0, -4.0f);
Animation_Change(&this->skelAnime, &object_dinofos_Anim_00D62C, this->actor.speedXZ * (1.0f / 7.5f), 0.0f, 0.0f, 0,
-4.0f);
this->actor.world.rot.y = BINANG_ADD(this->actor.shape.rot.y, 0x4000);
this->unk_292 = 10;
this->unk_2A4 = 0.0f;
src/overlays/actors/ovl_En_Dnb/z_en_dnb.c
+9 -13
View File
@@ -5,6 +5,8 @@
*/
#include "z_en_dnb.h"
#include "objects/object_hanareyama_obj/object_hanareyama_obj.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x000000B0
@@ -19,12 +21,6 @@ s32 func_80A507C0(EnDnbUnkStruct* arg0, Vec3f arg1, Vec3f arg2, u8 arg3, f32 arg
s32 func_80A5086C(EnDnbUnkStruct* arg0);
s32 func_80A50950(EnDnbUnkStruct* arg0, GlobalContext* globalCtx);
extern Gfx D_06000000[];
extern Gfx D_06000020[];
extern Gfx D_06004638[];
extern Vec3s D_06004710[];
extern CollisionHeader D_06004D8C;
const ActorInit En_Dnb_InitVars = {
ACTOR_EN_DNB,
ACTORCAT_BG,
@@ -109,9 +105,9 @@ void EnDnb_Init(Actor* thisx, GlobalContext* globalCtx) {
s16* alloc;
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06004D8C);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_hanareyama_obj_Colheader_004D8C);
alloc = (s16*)Lib_SegmentedToVirtual(D_06004710);
alloc = (s16*)Lib_SegmentedToVirtual(object_hanareyama_obj_Vec_004710);
for (i = 0; i < ARRAY_COUNT(this->particles); i++) {
func_80A4FDD0(&this->particles[i], this, alloc, i);
}
@@ -156,7 +152,7 @@ void EnDnb_Update(Actor* thisx, GlobalContext* globalCtx) {
void func_80A50510(EnDnb* this, GlobalContext* globalCtx) {
s32 i;
Gfx** gfx = Lib_SegmentedToVirtual(D_06004638);
Gfx** gfx = Lib_SegmentedToVirtual(object_hanareyama_obj_DLArray_004638);
OPEN_DISPS(globalCtx->state.gfxCtx);
@@ -181,7 +177,7 @@ void func_80A50510(EnDnb* this, GlobalContext* globalCtx) {
void func_80A5063C(EnDnb* this, GlobalContext* globalCtx) {
s32 i;
Gfx** gfx = Lib_SegmentedToVirtual(D_06004638);
Gfx** gfx = Lib_SegmentedToVirtual(object_hanareyama_obj_DLArray_004638);
OPEN_DISPS(globalCtx->state.gfxCtx);
@@ -259,7 +255,7 @@ s32 func_80A5086C(EnDnbUnkStruct* arg0) {
s32 func_80A50950(EnDnbUnkStruct* arg0, GlobalContext* globalCtx2) {
static TexturePtr D_80A50CBC[] = {
D_0408F7E0, D_0408F3E0, D_0408EFE0, D_0408EBE0, D_0408E7E0, D_0408E3E0, D_0408DFE0, D_0408DBE0,
gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex,
};
GlobalContext* globalCtx = globalCtx2;
s32 isGfxSetup = false;
@@ -275,7 +271,7 @@ s32 func_80A50950(EnDnbUnkStruct* arg0, GlobalContext* globalCtx2) {
if (arg0->isEnabled == 1) {
if (!isGfxSetup) {
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0);
gSPDisplayList(POLY_XLU_DISP++, D_06000000);
gSPDisplayList(POLY_XLU_DISP++, object_hanareyama_obj_DL_000000);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 0);
isGfxSetup = true;
}
@@ -294,7 +290,7 @@ s32 func_80A50950(EnDnbUnkStruct* arg0, GlobalContext* globalCtx2) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
idx = (arg0->unk_01 / (f32)arg0->unk_02) * 8.0f;
gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(D_80A50CBC[idx]));
gSPDisplayList(POLY_XLU_DISP++, D_06000020);
gSPDisplayList(POLY_XLU_DISP++, object_hanareyama_obj_DL_000020);
Matrix_StatePop();
sp5C += 1;
src/overlays/actors/ovl_En_Dnk/z_en_dnk.c
+32 -53
View File
@@ -5,6 +5,9 @@
*/
#include "z_en_dnk.h"
#include "objects/object_dnk/object_dnk.h"
#include "objects/object_hintnuts/object_hintnuts.h"
#include "objects/object_dekunuts/object_dekunuts.h"
#define FLAGS 0x00000009
@@ -19,39 +22,6 @@ void EnDnk_DoNothing(EnDnk* this, GlobalContext* globalCtx);
void func_80A52018(Actor* thisx, GlobalContext* globalCtx);
void func_80A52134(EnDnk* this, GlobalContext* globalCtx);
extern AnimationHeader D_06000168;
extern AnimationHeader D_0600031C;
extern AnimationHeader D_06000430;
extern AnimationHeader D_060006CC;
extern AnimationHeader D_06000894;
extern AnimationHeader D_06000B70;
extern UNK_PTR D_06001680[];
extern UNK_PTR D_06001700[];
extern UNK_PTR D_06001780[];
extern SkeletonHeader D_060023B8;
extern SkeletonHeader D_06002468;
extern AnimationHeader D_060024CC;
extern AnimationHeader D_0600259C;
extern AnimationHeader D_060026C4;
extern SkeletonHeader D_06002848;
extern AnimationHeader D_06002894;
extern AnimationHeader D_06002950;
extern AnimationHeader D_060029BC;
extern AnimationHeader D_06002A08;
extern AnimationHeader D_06002A5C;
extern AnimationHeader D_06002B6C;
extern AnimationHeader D_06002B90;
extern AnimationHeader D_06002BD4;
extern AnimationHeader D_06002DD4;
extern AnimationHeader D_06002E84;
extern AnimationHeader D_06002F7C;
extern AnimationHeader D_06002FA4;
extern AnimationHeader D_06003128;
extern AnimationHeader D_06003180;
extern AnimationHeader D_0600326C;
extern AnimationHeader D_060033E4;
extern AnimationHeader D_06003780;
static s16 D_80A521A0 = 0;
const ActorInit En_Dnk_InitVars = {
@@ -124,18 +94,24 @@ static DamageTable sDamageTable = {
};
static ActorAnimationEntryS sAnimations[] = {
{ &D_06000B70, 1.0f, 0, -1, 2, 0 }, { &D_06000B70, 1.0f, 0, -1, 2, -4 }, { &D_06002A08, 1.0f, 0, -1, 0, -4 },
{ &D_0600031C, 1.0f, 0, -1, 0, -4 }, { &D_06000430, 1.0f, -1, -1, 2, 0 }, { &D_06000430, 1.0f, 0, -1, 2, -4 },
{ &D_06000894, 1.0f, 0, -1, 2, -4 }, { &D_06002B6C, 1.0f, 0, -1, 0, 0 }, { &D_06002B6C, 1.0f, 0, -1, 0, -4 },
{ &D_060006CC, 1.0f, 0, -1, 0, -4 }, { &D_06000168, 1.0f, 0, -1, 2, -4 }, { &D_060024CC, 1.0f, -1, -1, 2, 0 },
{ &D_060024CC, 1.0f, 0, -1, 2, -4 }, { &D_060026C4, 1.0f, 0, -1, 2, -4 }, { &D_06002894, 1.0f, 0, -1, 2, -4 },
{ &D_06002B90, 1.0f, 0, -1, 2, -4 }, { &D_06002F7C, 1.0f, 0, -1, 0, 0 }, { &D_06002F7C, 1.0f, 0, -1, 0, -4 },
{ &D_06003128, 1.0f, 0, -1, 0, 0 }, { &D_06003128, 1.0f, 0, -1, 0, -4 }, { &D_060029BC, 1.0f, 0, -1, 0, -4 },
{ &D_06002E84, 1.0f, 0, -1, 0, -4 }, { &D_06000168, 1.0f, 0, -1, 0, -4 }, { &D_0600259C, 1.0f, 0, -1, 2, -4 },
{ &D_06002A5C, 1.0f, 0, -1, 2, 0 }, { &D_06002A5C, 1.0f, 0, -1, 2, -4 }, { &D_06002BD4, 1.0f, 0, -1, 2, -4 },
{ &D_06002DD4, 1.0f, 0, -1, 2, -4 }, { &D_06002FA4, 1.0f, 0, -1, 0, -4 }, { &D_06003180, 1.0f, 0, -1, 2, -4 },
{ &D_0600326C, 1.0f, 0, -1, 0, 0 }, { &D_0600326C, 1.0f, 0, -1, 0, -4 }, { &D_060033E4, 1.0f, 0, -1, 0, -4 },
{ &D_06003780, 1.0f, 0, -1, 0, 0 }, { &D_06003780, 1.0f, 0, -1, 0, -4 }, { &D_06002950, 1.0f, 0, -1, 0, 0 },
{ &object_dnk_Anim_000B70, 1.0f, 0, -1, 2, 0 }, { &object_dnk_Anim_000B70, 1.0f, 0, -1, 2, -4 },
{ &object_dnk_Anim_002A08, 1.0f, 0, -1, 0, -4 }, { &object_dnk_Anim_00031C, 1.0f, 0, -1, 0, -4 },
{ &object_dnk_Anim_000430, 1.0f, -1, -1, 2, 0 }, { &object_dnk_Anim_000430, 1.0f, 0, -1, 2, -4 },
{ &object_dnk_Anim_000894, 1.0f, 0, -1, 2, -4 }, { &object_dnk_Anim_002B6C, 1.0f, 0, -1, 0, 0 },
{ &object_dnk_Anim_002B6C, 1.0f, 0, -1, 0, -4 }, { &object_dnk_Anim_0006CC, 1.0f, 0, -1, 0, -4 },
{ &object_hintnuts_Anim_000168, 1.0f, 0, -1, 2, -4 }, { &object_hintnuts_Anim_0024CC, 1.0f, -1, -1, 2, 0 },
{ &object_hintnuts_Anim_0024CC, 1.0f, 0, -1, 2, -4 }, { &object_hintnuts_Anim_0026C4, 1.0f, 0, -1, 2, -4 },
{ &object_hintnuts_Anim_002894, 1.0f, 0, -1, 2, -4 }, { &object_hintnuts_Anim_002B90, 1.0f, 0, -1, 2, -4 },
{ &object_hintnuts_Anim_002F7C, 1.0f, 0, -1, 0, 0 }, { &object_hintnuts_Anim_002F7C, 1.0f, 0, -1, 0, -4 },
{ &object_hintnuts_Anim_003128, 1.0f, 0, -1, 0, 0 }, { &object_hintnuts_Anim_003128, 1.0f, 0, -1, 0, -4 },
{ &object_hintnuts_Anim_0029BC, 1.0f, 0, -1, 0, -4 }, { &object_hintnuts_Anim_002E84, 1.0f, 0, -1, 0, -4 },
{ &object_dekunuts_Anim_000168, 1.0f, 0, -1, 0, -4 }, { &object_dekunuts_Anim_00259C, 1.0f, 0, -1, 2, -4 },
{ &object_dekunuts_Anim_002A5C, 1.0f, 0, -1, 2, 0 }, { &object_dekunuts_Anim_002A5C, 1.0f, 0, -1, 2, -4 },
{ &object_dekunuts_Anim_002BD4, 1.0f, 0, -1, 2, -4 }, { &object_dekunuts_Anim_002DD4, 1.0f, 0, -1, 2, -4 },
{ &object_dekunuts_Anim_002FA4, 1.0f, 0, -1, 0, -4 }, { &object_dekunuts_Anim_003180, 1.0f, 0, -1, 2, -4 },
{ &object_dekunuts_Anim_00326C, 1.0f, 0, -1, 0, 0 }, { &object_dekunuts_Anim_00326C, 1.0f, 0, -1, 0, -4 },
{ &object_dekunuts_Anim_0033E4, 1.0f, 0, -1, 0, -4 }, { &object_dekunuts_Anim_003780, 1.0f, 0, -1, 0, 0 },
{ &object_dekunuts_Anim_003780, 1.0f, 0, -1, 0, -4 }, { &object_dekunuts_Anim_002950, 1.0f, 0, -1, 0, 0 },
};
s32 func_80A514F0(SkelAnime* skelAnime, s16 animIndex) {
@@ -144,7 +120,7 @@ s32 func_80A514F0(SkelAnime* skelAnime, s16 animIndex) {
s32 sp30 = false;
if (animIndex >= 0) {
if (animIndex < 36) {
if (animIndex < ARRAY_COUNT(sAnimations)) {
sp30 = true;
frameCount = sAnimations[animIndex].frameCount;
if (frameCount < 0) {
@@ -184,17 +160,20 @@ void func_80A51648(EnDnk* this, GlobalContext* globalCtx) {
switch (ENDNK_GET_3(&this->actor)) {
case ENDNK_GET_3_0:
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06002848, NULL, this->jointTable, this->morphTable, 11);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_dnk_Skel_002848, NULL, this->jointTable,
this->morphTable, 11);
func_80A514F0(&this->skelAnime, 7);
break;
case ENDNK_GET_3_1:
SkelAnime_Init(globalCtx, &this->skelAnime, &D_060023B8, NULL, this->jointTable, this->morphTable, 10);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_hintnuts_Skel_0023B8.sh, NULL, this->jointTable,
this->morphTable, 10);
func_80A514F0(&this->skelAnime, 18);
break;
case ENDNK_GET_3_2:
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06002468, NULL, this->jointTable, this->morphTable, 10);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_dekunuts_Skel_002468, NULL, this->jointTable,
this->morphTable, 10);
func_80A514F0(&this->skelAnime, 35);
break;
}
@@ -328,10 +307,10 @@ void func_80A51AA4(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s*
}
void func_80A51CB8(EnDnk* this, GlobalContext* globalCtx) {
static UNK_PTR D_80A5245C[] = {
D_06001680,
D_06001700,
D_06001780,
static TexturePtr D_80A5245C[] = {
object_dnk_Tex_001680,
object_dnk_Tex_001700,
object_dnk_Tex_001780,
};
s32 pad;
src/overlays/actors/ovl_En_Dno/z_en_dno.c
+13 -30
View File
@@ -7,6 +7,7 @@
#include "z_en_dno.h"
#include "overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_dno/object_dno.h"
#define FLAGS 0x00000039
@@ -39,37 +40,19 @@ void func_80A732C8(EnDno* this, GlobalContext* globalCtx);
s32 EnDno_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx);
void EnDno_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx);
extern AnimationHeader D_06000470;
extern AnimationHeader D_060008F0;
extern AnimationHeader D_06000F6C;
extern AnimationHeader D_06001A50;
extern AnimationHeader D_06002530;
extern AnimationHeader D_06003320;
extern AnimationHeader D_060036D0;
extern AnimationHeader D_060041CC;
extern AnimationHeader D_06004DD8;
extern AnimationHeader D_060051E4;
extern AnimationHeader D_06005E20;
extern AnimationHeader D_06005F98;
extern AnimationHeader D_06006488;
extern AnimationHeader D_06006F84;
extern AnimationHeader D_060073E4;
extern AnimationHeader D_060077A8;
extern AnimationHeader D_06007CA4;
extern AnimationHeader D_06008324;
extern AnimationHeader D_06008AE4;
extern AnimationHeader D_06009100;
extern FlexSkeletonHeader D_0600E1F8;
extern u8 D_801C20C0;
static struct_80B8E1A8 sAnimations[] = {
{ &D_06000470, 1.0f, 2, 0.0f }, { &D_060008F0, 1.0f, 2, 0.0f }, { &D_06000F6C, 1.0f, 0, 0.0f },
{ &D_06001A50, 1.0f, 2, 0.0f }, { &D_06002530, 1.0f, 2, 0.0f }, { &D_06003320, 1.0f, 2, 0.0f },
{ &D_060036D0, 1.0f, 0, 0.0f }, { &D_060041CC, 1.0f, 2, 0.0f }, { &D_06004DD8, 1.0f, 2, 0.0f },
{ &D_06005F98, 1.0f, 0, 0.0f }, { &D_06006488, 1.0f, 2, 0.0f }, { &D_060073E4, 1.0f, 0, 0.0f },
{ &D_060077A8, 1.0f, 0, 0.0f }, { &D_06007CA4, 1.0f, 0, 0.0f }, { &D_06008324, 1.0f, 0, 0.0f },
{ &D_06008AE4, 1.0f, 2, 0.0f }, { &D_06009100, 1.0f, 2, 0.0f }, { &D_060051E4, 1.0f, 2, 0.0f },
{ &D_06005E20, 1.0f, 0, 0.0f }, { &D_06006F84, 1.0f, 0, 0.0f },
{ &object_dno_Anim_000470, 1.0f, 2, 0.0f }, { &object_dno_Anim_0008F0, 1.0f, 2, 0.0f },
{ &object_dno_Anim_000F6C, 1.0f, 0, 0.0f }, { &object_dno_Anim_001A50, 1.0f, 2, 0.0f },
{ &object_dno_Anim_002530, 1.0f, 2, 0.0f }, { &object_dno_Anim_003320, 1.0f, 2, 0.0f },
{ &object_dno_Anim_0036D0, 1.0f, 0, 0.0f }, { &object_dno_Anim_0041CC, 1.0f, 2, 0.0f },
{ &object_dno_Anim_004DD8, 1.0f, 2, 0.0f }, { &object_dno_Anim_005F98, 1.0f, 0, 0.0f },
{ &object_dno_Anim_006488, 1.0f, 2, 0.0f }, { &object_dno_Anim_0073E4, 1.0f, 0, 0.0f },
{ &object_dno_Anim_0077A8, 1.0f, 0, 0.0f }, { &object_dno_Anim_007CA4, 1.0f, 0, 0.0f },
{ &object_dno_Anim_008324, 1.0f, 0, 0.0f }, { &object_dno_Anim_008AE4, 1.0f, 2, 0.0f },
{ &object_dno_Anim_009100, 1.0f, 2, 0.0f }, { &object_dno_Anim_0051E4, 1.0f, 2, 0.0f },
{ &object_dno_Anim_005E20, 1.0f, 0, 0.0f }, { &object_dno_Anim_006F84, 1.0f, 0, 0.0f },
};
const ActorInit En_Dno_InitVars = {
@@ -213,8 +196,8 @@ void EnDno_Init(Actor* thisx, GlobalContext* globalCtx) {
if (actor == NULL) {
Actor_ProcessInitChain(thisx, sInitChain);
ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawCircle, 21.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600E1F8, &D_06007CA4, this->jointTable,
this->morphTable, 28);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dno_Skel_00E1F8, &object_dno_Anim_007CA4,
this->jointTable, this->morphTable, 28);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, thisx, &sCylinderInit);
Actor_UpdateBgCheckInfo(globalCtx, thisx, 0.0f, 0.0f, 0.0f, 4);
src/overlays/actors/ovl_En_Dnp/z_en_dnp.c
+21 -44
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_dnp.h"
#include "objects/object_dnp/object_dnp.h"
#define FLAGS 0x00000019
@@ -21,35 +22,6 @@ void func_80B3D338(EnDnp* this, GlobalContext* globalCtx);
void func_80B3D3F8(EnDnp* this, GlobalContext* globalCtx);
void func_80B3D558(EnDnp* this, GlobalContext* globalCtx);
extern AnimationHeader D_060007D8;
extern AnimationHeader D_0600125C;
extern AnimationHeader D_060017F8;
extern AnimationHeader D_06001C1C;
extern AnimationHeader D_060021DC;
extern AnimationHeader D_060026B8;
extern AnimationHeader D_06004D08;
extern AnimationHeader D_060057AC;
extern AnimationHeader D_0600625C;
extern AnimationHeader D_0600674C;
extern AnimationHeader D_06006B74;
extern AnimationHeader D_060071F4;
extern AnimationHeader D_06007960;
extern AnimationHeader D_06008588;
extern AnimationHeader D_0600923C;
extern AnimationHeader D_06009AA0;
extern AnimationHeader D_0600A900;
extern AnimationHeader D_0600AEB8;
extern AnimationHeader D_0600B324;
extern AnimationHeader D_0600B754;
extern AnimationHeader D_0600BAD8;
extern Gfx D_060103D0[];
extern Gfx D_060105D0[];
extern Gfx D_060107D0[];
extern Gfx D_060109D0[];
extern FlexSkeletonHeader D_06010D60;
extern AnimationHeader D_060115B8;
extern AnimationHeader D_06012428;
const ActorInit En_Dnp_InitVars = {
ACTOR_EN_DNP,
ACTORCAT_NPC,
@@ -85,15 +57,19 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
static ActorAnimationEntryS sAnimations[] = {
{ &D_060007D8, 1.0f, 0, -1, 2, -4 }, { &D_060021DC, 1.0f, 0, -1, 0, 0 }, { &D_060021DC, 1.0f, 0, -1, 0, -4 },
{ &D_060026B8, 1.0f, 0, -1, 2, -4 }, { &D_06004D08, 1.0f, 0, -1, 2, -4 }, { &D_060071F4, 1.0f, 0, -1, 2, -4 },
{ &D_06007960, 1.0f, 0, -1, 0, -4 }, { &D_06008588, 1.0f, 0, -1, 2, 0 }, { &D_0600A900, 1.0f, 0, -1, 0, -4 },
{ &D_0600AEB8, 1.0f, 0, -1, 0, -4 }, { &D_0600B754, 1.0f, 0, -1, 2, -4 }, { &D_0600674C, 1.0f, 0, -1, 0, -4 },
{ &D_0600BAD8, 1.0f, 0, -1, 2, -4 }, { &D_06006B74, 1.0f, 0, -1, 0, -4 }, { &D_06012428, 1.0f, 0, -1, 0, -4 },
{ &D_0600B324, 1.0f, 0, -1, 0, 0 }, { &D_0600B324, 1.0f, 0, -1, 0, -4 }, { &D_060115B8, 1.0f, 0, -1, 0, -4 },
{ &D_060115B8, 1.0f, 0, -1, 0, 0 }, { &D_0600923C, 1.0f, 0, -1, 2, -4 }, { &D_06009AA0, 1.0f, 0, -1, 0, -4 },
{ &D_0600125C, 1.0f, 0, -1, 2, -4 }, { &D_060017F8, 1.0f, 0, -1, 2, 0 }, { &D_06001C1C, 1.0f, 0, -1, 0, -4 },
{ &D_060057AC, 1.0f, 0, -1, 2, 0 }, { &D_0600625C, 1.0f, 0, -1, 0, -4 },
{ &object_dnp_Anim_0007D8, 1.0f, 0, -1, 2, -4 }, { &object_dnp_Anim_0021DC, 1.0f, 0, -1, 0, 0 },
{ &object_dnp_Anim_0021DC, 1.0f, 0, -1, 0, -4 }, { &object_dnp_Anim_0026B8, 1.0f, 0, -1, 2, -4 },
{ &object_dnp_Anim_004D08, 1.0f, 0, -1, 2, -4 }, { &object_dnp_Anim_0071F4, 1.0f, 0, -1, 2, -4 },
{ &object_dnp_Anim_007960, 1.0f, 0, -1, 0, -4 }, { &object_dnp_Anim_008588, 1.0f, 0, -1, 2, 0 },
{ &object_dnp_Anim_00A900, 1.0f, 0, -1, 0, -4 }, { &object_dnp_Anim_00AEB8, 1.0f, 0, -1, 0, -4 },
{ &object_dnp_Anim_00B754, 1.0f, 0, -1, 2, -4 }, { &object_dnp_Anim_00674C, 1.0f, 0, -1, 0, -4 },
{ &object_dnp_Anim_00BAD8, 1.0f, 0, -1, 2, -4 }, { &object_dnp_Anim_006B74, 1.0f, 0, -1, 0, -4 },
{ &object_dnp_Anim_012428, 1.0f, 0, -1, 0, -4 }, { &object_dnp_Anim_00B324, 1.0f, 0, -1, 0, 0 },
{ &object_dnp_Anim_00B324, 1.0f, 0, -1, 0, -4 }, { &object_dnp_Anim_0115B8, 1.0f, 0, -1, 0, -4 },
{ &object_dnp_Anim_0115B8, 1.0f, 0, -1, 0, 0 }, { &object_dnp_Anim_00923C, 1.0f, 0, -1, 2, -4 },
{ &object_dnp_Anim_009AA0, 1.0f, 0, -1, 0, -4 }, { &object_dnp_Anim_00125C, 1.0f, 0, -1, 2, -4 },
{ &object_dnp_Anim_0017F8, 1.0f, 0, -1, 2, 0 }, { &object_dnp_Anim_001C1C, 1.0f, 0, -1, 0, -4 },
{ &object_dnp_Anim_0057AC, 1.0f, 0, -1, 2, 0 }, { &object_dnp_Anim_00625C, 1.0f, 0, -1, 0, -4 },
};
static s32 D_80B3DE58[] = {
@@ -358,7 +334,8 @@ void EnDnp_Init(Actor* thisx, GlobalContext* globalCtx) {
EnDnp* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 16.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06010D60, NULL, this->jointTable, this->morphTable, 26);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dnp_Skel_010D60, NULL, this->jointTable, this->morphTable,
26);
this->unk_340 = -1;
func_80B3CC38(this, 15);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
@@ -489,11 +466,11 @@ void EnDnp_TransformLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* thi
}
void EnDnp_Draw(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* D_80B3DEAC[] = {
D_060103D0,
D_060105D0,
D_060107D0,
D_060109D0,
static TexturePtr D_80B3DEAC[] = {
object_dnp_Tex_0103D0,
object_dnp_Tex_0105D0,
object_dnp_Tex_0107D0,
object_dnp_Tex_0109D0,
};
EnDnp* this = THIS;
src/overlays/actors/ovl_En_Dnq/z_en_dnq.c
+13 -26
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_dnq.h"
#include "objects/object_dnq/object_dnq.h"
#define FLAGS 0x00000009
@@ -17,24 +18,6 @@ void EnDnq_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80A52FB8(EnDnq* this, GlobalContext* globalCtx);
extern AnimationHeader D_060006F0;
extern AnimationHeader D_06000BF8;
extern AnimationHeader D_06001100;
extern AnimationHeader D_06001AEC;
extern AnimationHeader D_06002690;
extern AnimationHeader D_06003408;
extern AnimationHeader D_06003DBC;
extern AnimationHeader D_060047B8;
extern AnimationHeader D_06004EA0;
extern AnimationHeader D_06005284;
extern AnimationHeader D_06005A14;
extern AnimationHeader D_06005E18;
extern AnimationHeader D_06006984;
extern AnimationHeader D_06007528;
extern AnimationHeader D_06008328;
extern FlexSkeletonHeader D_0600EB48;
extern AnimationHeader D_0600F504;
static s32 D_80A53400[] = {
0x00120100, 0x150E0899, 0x0C120F08, 0x9A0C0F08, 0x9B0C0F08, 0x9C0C1112, 0x01100E08, 0x980C1000, 0x00120200,
0x0C0E089D, 0x0C0F089E, 0x0C111202, 0x100E089F, 0x0C100000, 0x0E08A10C, 0x0F08A20C, 0x10000000,
@@ -75,13 +58,16 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 1, 0, 0, 0, MASS_IMMOVABLE };
static ActorAnimationEntryS D_80A5349C[] = {
{ &D_06008328, 1.0f, 0, -1, 0, 0 }, { &D_06008328, 1.0f, 0, -1, 0, -4 }, { &D_06007528, 1.0f, 0, -1, 2, -4 },
{ &D_060006F0, 1.0f, 0, -1, 2, 0 }, { &D_06000BF8, 1.0f, 0, -1, 0, -4 }, { &D_06002690, 0.0f, 0, -1, 2, 0 },
{ &D_06002690, 1.0f, 0, -1, 2, -4 }, { &D_06003408, 1.0f, 0, -1, 0, -4 }, { &D_06006984, 1.0f, 0, -1, 2, -4 },
{ &D_06005E18, 1.0f, 0, -1, 2, -4 }, { &D_06005A14, 1.0f, 0, -1, 2, -4 }, { &D_06005284, 1.0f, 0, -1, 2, -4 },
{ &D_06001AEC, 1.0f, 0, -1, 2, 0 }, { &D_06001100, 1.0f, 0, -1, 2, 0 }, { &D_06004EA0, 1.0f, 0, -1, 0, -4 },
{ &D_0600F504, 1.0f, 0, -1, 0, -4 }, { &D_060047B8, 1.0f, 0, -1, 0, -4 }, { &D_06003DBC, 1.0f, 0, -1, 2, -4 },
{ &D_06005A14, 1.0f, 0, -1, 0, -4 }, { &D_06003DBC, 1.0f, 0, -1, 0, -4 },
{ &object_dnq_Anim_008328, 1.0f, 0, -1, 0, 0 }, { &object_dnq_Anim_008328, 1.0f, 0, -1, 0, -4 },
{ &object_dnq_Anim_007528, 1.0f, 0, -1, 2, -4 }, { &object_dnq_Anim_0006F0, 1.0f, 0, -1, 2, 0 },
{ &object_dnq_Anim_000BF8, 1.0f, 0, -1, 0, -4 }, { &object_dnq_Anim_002690, 0.0f, 0, -1, 2, 0 },
{ &object_dnq_Anim_002690, 1.0f, 0, -1, 2, -4 }, { &object_dnq_Anim_003408, 1.0f, 0, -1, 0, -4 },
{ &object_dnq_Anim_006984, 1.0f, 0, -1, 2, -4 }, { &object_dnq_Anim_005E18, 1.0f, 0, -1, 2, -4 },
{ &object_dnq_Anim_005A14, 1.0f, 0, -1, 2, -4 }, { &object_dnq_Anim_005284, 1.0f, 0, -1, 2, -4 },
{ &object_dnq_Anim_001AEC, 1.0f, 0, -1, 2, 0 }, { &object_dnq_Anim_001100, 1.0f, 0, -1, 2, 0 },
{ &object_dnq_Anim_004EA0, 1.0f, 0, -1, 0, -4 }, { &object_dnq_Anim_00F504, 1.0f, 0, -1, 0, -4 },
{ &object_dnq_Anim_0047B8, 1.0f, 0, -1, 0, -4 }, { &object_dnq_Anim_003DBC, 1.0f, 0, -1, 2, -4 },
{ &object_dnq_Anim_005A14, 1.0f, 0, -1, 0, -4 }, { &object_dnq_Anim_003DBC, 1.0f, 0, -1, 0, -4 },
};
void func_80A52530(GlobalContext* globalCtx, EnDnq* this) {
@@ -420,7 +406,8 @@ void EnDnq_Init(Actor* thisx, GlobalContext* globalCtx) {
EnDnq* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 14.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600EB48, NULL, this->jointTable, this->morphTable, 33);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dnq_Skel_00EB48, NULL, this->jointTable, this->morphTable,
33);
this->unk_398 = -1;
func_80A5257C(this, 0);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
src/overlays/actors/ovl_En_Dns/z_en_dns.c
+10 -21
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_dns.h"
#include "objects/object_dns/object_dns.h"
#define FLAGS 0x00000019
@@ -19,20 +20,6 @@ void func_8092D330(EnDns* this, GlobalContext* globalCtx);
void EnDns_DoNothing(EnDns* this, GlobalContext* globalCtx);
void func_8092D4D8(EnDns* this, GlobalContext* globalCtx);
extern AnimationHeader D_060002A8;
extern AnimationHeader D_06000734;
extern AnimationHeader D_060008F4;
extern AnimationHeader D_06000BD8;
extern AnimationHeader D_06000D58;
extern AnimationHeader D_06000FEC;
extern TexturePtr D_060028E8;
extern TexturePtr D_06002968;
extern TexturePtr D_060029E8;
extern Gfx D_06002C48[];
extern SkeletonHeader D_06002DD8;
extern AnimationHeader D_06003310;
extern AnimationHeader D_060034EC;
static s32 D_8092DCB0[] = {
0x00172000, 0x050E082F, 0x0C100E08, 0x200C1000, 0x00172000, 0x050E0830, 0x0C100E08, 0x210C1000,
0x00172000, 0x050E0831, 0x0C100E08, 0x220C1000, 0x00172000, 0x050E0832, 0x0C100E08, 0x230C1000,
@@ -74,10 +61,11 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 1, 0, 0, 0, MASS_IMMOVABLE };
static ActorAnimationEntryS sAnimations[] = {
{ &D_06003310, 1.0f, 0, -1, 0, 0 }, { &D_06003310, 1.0f, 0, -1, 0, -4 }, { &D_060034EC, 1.0f, 0, -1, 0, 0 },
{ &D_060034EC, 1.0f, 0, -1, 0, -4 }, { &D_060008F4, 1.0f, 0, -1, 2, 0 }, { &D_06000BD8, 1.0f, 0, -1, 0, 0 },
{ &D_06000D58, 1.0f, 0, -1, 2, 0 }, { &D_06000FEC, 1.0f, 0, -1, 0, 0 }, { &D_060002A8, 1.0f, 0, -1, 2, 0 },
{ &D_06000734, 1.0f, 0, -1, 2, 0 },
{ &object_dns_Anim_003310, 1.0f, 0, -1, 0, 0 }, { &object_dns_Anim_003310, 1.0f, 0, -1, 0, -4 },
{ &object_dns_Anim_0034EC, 1.0f, 0, -1, 0, 0 }, { &object_dns_Anim_0034EC, 1.0f, 0, -1, 0, -4 },
{ &object_dns_Anim_0008F4, 1.0f, 0, -1, 2, 0 }, { &object_dns_Anim_000BD8, 1.0f, 0, -1, 0, 0 },
{ &object_dns_Anim_000D58, 1.0f, 0, -1, 2, 0 }, { &object_dns_Anim_000FEC, 1.0f, 0, -1, 0, 0 },
{ &object_dns_Anim_0002A8, 1.0f, 0, -1, 2, 0 }, { &object_dns_Anim_000734, 1.0f, 0, -1, 2, 0 },
};
void func_8092C5C0(EnDns* this) {
@@ -376,7 +364,7 @@ void func_8092D108(EnDns* this, GlobalContext* globalCtx) {
Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06002C48);
gSPDisplayList(POLY_OPA_DISP++, object_dns_DL_002C48);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -495,7 +483,7 @@ void EnDns_Init(Actor* thisx, GlobalContext* globalCtx) {
}
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 18.0f);
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06002DD8, NULL, this->jointTable, this->morphTable, 13);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_dns_Skel_002DD8, NULL, this->jointTable, this->morphTable, 13);
this->unk_2F8 = -1;
func_8092C63C(this, 2);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
@@ -616,7 +604,8 @@ void EnDns_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
}
void EnDns_Draw(Actor* thisx, GlobalContext* globalCtx) {
static TexturePtr D_8092DE1C[] = { &D_060028E8, &D_06002968, &D_060029E8, &D_06002968 };
static TexturePtr D_8092DE1C[] = { object_dns_Tex_0028E8, object_dns_Tex_002968, object_dns_Tex_0029E8,
object_dns_Tex_002968 };
EnDns* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx);
src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
+12 -20
View File
@@ -7,6 +7,7 @@
#include "z_en_dodongo.h"
#include "overlays/actors/ovl_En_Bom/z_en_bom.h"
#include "overlays/actors/ovl_En_Bombf/z_en_bombf.h"
#include "objects/object_dodongo/object_dodongo.h"
#define FLAGS 0x00000405
@@ -34,16 +35,6 @@ void func_808786C8(EnDodongo* this, GlobalContext* globalCtx);
void func_80878724(EnDodongo* this);
void func_808787B0(EnDodongo* this, GlobalContext* globalCtx);
extern AnimationHeader D_060013C4;
extern AnimationHeader D_06001A44;
extern AnimationHeader D_060028F0;
extern AnimationHeader D_06003088;
extern AnimationHeader D_06003B14;
extern AnimationHeader D_060042C4;
extern AnimationHeader D_06004C20;
extern SkeletonHeader D_06008318;
extern AnimationHeader D_06008B1C;
const ActorInit En_Dodongo_InitVars = {
ACTOR_EN_DODONGO,
ACTORCAT_ENEMY,
@@ -304,7 +295,8 @@ void EnDodongo_Init(Actor* thisx, GlobalContext* globalCtx) {
this->unk_330.a = 200;
Math_Vec3f_Copy(&this->unk_314, &D_801C5DB0);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 48.0f);
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06008318, &D_06004C20, this->jointTable, this->morphTable, 31);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_dodongo_Skel_008318, &object_dodongo_Anim_004C20,
this->jointTable, this->morphTable, 31);
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
Collider_InitAndSetJntSph(globalCtx, &this->collider2, &this->actor, &sJntSphInit2, this->collider2Elements);
Collider_InitAndSetJntSph(globalCtx, &this->collider1, &this->actor, &sJntSphInit1, this->collider1Elements);
@@ -545,7 +537,7 @@ s32 func_80877278(EnDodongo* this, GlobalContext* globalCtx) {
}
void func_808773C4(EnDodongo* this) {
Animation_MorphToLoop(&this->skelAnime, &D_06004C20, -4.0f);
Animation_MorphToLoop(&this->skelAnime, &object_dodongo_Anim_004C20, -4.0f);
this->actor.speedXZ = 0.0f;
this->timer = Rand_S16Offset(30, 50);
this->actionFunc = func_80877424;
@@ -565,7 +557,7 @@ void func_80877424(EnDodongo* this, GlobalContext* globalCtx) {
}
void func_80877494(EnDodongo* this) {
Animation_MorphToLoop(&this->skelAnime, &D_06008B1C, -4.0f);
Animation_MorphToLoop(&this->skelAnime, &object_dodongo_Anim_008B1C, -4.0f);
this->actor.speedXZ = this->unk_334 * 1.5f;
this->timer = Rand_S16Offset(50, 70);
this->actionFunc = func_80877500;
@@ -624,7 +616,7 @@ void func_808777A8(EnDodongo* this) {
s32 i;
Sphere16* sph;
Animation_MorphToPlayOnce(&this->skelAnime, &D_060028F0, -4.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dodongo_Anim_0028F0, -4.0f);
this->actor.speedXZ = 0.0f;
for (i = 0; i < ARRAY_COUNT(this->collider3Elements); i++) {
@@ -689,7 +681,7 @@ void func_8087784C(EnDodongo* this, GlobalContext* globalCtx) {
}
void func_80877D50(EnDodongo* this) {
Animation_PlayOnce(&this->skelAnime, &D_06003088);
Animation_PlayOnce(&this->skelAnime, &object_dodongo_Anim_003088);
this->actionFunc = func_80877D90;
}
@@ -701,7 +693,7 @@ void func_80877D90(EnDodongo* this, GlobalContext* globalCtx) {
}
void func_80877DE0(EnDodongo* this) {
Animation_Change(&this->skelAnime, &D_060028F0, -1.0f, 35.0f, 0.0f, 2, -4.0f);
Animation_Change(&this->skelAnime, &object_dodongo_Anim_0028F0, -1.0f, 35.0f, 0.0f, 2, -4.0f);
this->actor.flags |= 0x10;
this->timer = 25;
this->actionFunc = func_80877E60;
@@ -813,10 +805,10 @@ void func_80878354(EnDodongo* this) {
this->unk_306 = (0xFFFF - ABS_ALT(yDiff)) / 15;
if (yDiff >= 0) {
sp18 = &D_060042C4;
sp18 = &object_dodongo_Anim_0042C4;
this->unk_306 = -this->unk_306;
} else {
sp18 = &D_06003B14;
sp18 = &object_dodongo_Anim_003B14;
}
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DODO_J_TAIL);
@@ -879,7 +871,7 @@ void func_808785B0(EnDodongo* this, GlobalContext* globalCtx) {
}
void func_8087864C(EnDodongo* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06001A44, -4.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dodongo_Anim_001A44, -4.0f);
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DODO_J_DAMAGE);
this->timer = 0;
this->unk_304 = 0;
@@ -899,7 +891,7 @@ void func_808786C8(EnDodongo* this, GlobalContext* globalCtx) {
}
void func_80878724(EnDodongo* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_060013C4, -8.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dodongo_Anim_0013C4, -8.0f);
this->timer = 0;
this->unk_304 = 0;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DODO_J_DEAD);
src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c
+7 -10
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_dy_extra.h"
#include "objects/object_dy_obj/object_dy_obj.h"
#define FLAGS 0x00000030
@@ -30,9 +31,6 @@ const ActorInit En_Dy_Extra_InitVars = {
(ActorFunc)EnDyExtra_Draw,
};
extern Vtx D_0600DD40[];
extern Gfx D_0600DEF0[];
void EnDyExtra_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
@@ -88,11 +86,10 @@ void EnDyExtra_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx) {
static Color_RGBA8 D_80A61740[] = { { 255, 255, 170, 255 },
{ 255, 170, 255, 255 },
{ 255, 255, 170, 255 },
{ 170, 255, 255, 255 },
{ 255, 255, 170, 255 } };
static Color_RGBA8 D_80A61740[] = {
{ 255, 255, 170, 255 }, { 255, 170, 255, 255 }, { 255, 255, 170, 255 },
{ 170, 255, 255, 255 }, { 255, 255, 170, 255 },
};
static Color_RGBA8 D_80A61754[] = {
{ 255, 100, 0, 255 }, { 255, 0, 100, 255 }, { 100, 255, 0, 255 }, { 0, 100, 255, 255 }, { 255, 230, 0, 255 }
};
@@ -101,7 +98,7 @@ void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnDyExtra* this = THIS;
s32 pad;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Vtx* vertices = Lib_SegmentedToVirtual(D_0600DD40);
Vtx* vertices = Lib_SegmentedToVirtual(object_dy_obj_Vtx_00DD40);
s32 i;
u8 unk[3];
@@ -126,7 +123,7 @@ void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, D_80A61740[this->type].r, D_80A61740[this->type].g,
D_80A61740[this->type].b, 255);
gDPSetEnvColor(POLY_XLU_DISP++, D_80A61754[this->type].r, D_80A61754[this->type].g, D_80A61754[this->type].b, 128);
gSPDisplayList(POLY_XLU_DISP++, D_0600DEF0);
gSPDisplayList(POLY_XLU_DISP++, object_dy_obj_DL_00DEF0);
CLOSE_DISPS(gfxCtx);
}
src/overlays/actors/ovl_En_Elf/z_en_elf.c
+3 -3
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_elf.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x02000030
@@ -32,8 +33,6 @@ void func_8088F5F4(EnElf* this, GlobalContext* globalCtx, s32 arg2);
void func_8089010C(Actor* thisx, GlobalContext* globalCtx);
void func_808908D0(Vec3f* arg0, GlobalContext* globalCtx, u32 arg2);
extern SkeletonHeader D_0402AF58;
const ActorInit En_Elf_InitVars = {
ACTOR_EN_ELF,
ACTORCAT_ITEMACTION,
@@ -322,7 +321,8 @@ void EnElf_Init(Actor* thisx, GlobalContext* globalCtx2) {
s32 params;
Actor_ProcessInitChain(thisx, sInitChain);
SkelAnime_Init(globalCtx, &this->skelAnime, &D_0402AF58, &D_04029140, this->jointTable, this->morphTable, 7);
SkelAnime_Init(globalCtx, &this->skelAnime, &gameplay_keep_Skel_02AF58.sh, &gameplay_keep_Anim_029140,
this->jointTable, this->morphTable, 7);
ActorShape_Init(&thisx->shape, 0.0f, NULL, 15.0f);
thisx->shape.shadowAlpha = 255;
src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c
+2 -3
View File
@@ -6,6 +6,7 @@
#include "z_en_elfbub.h"
#include "overlays/actors/ovl_En_Elforg/z_en_elforg.h"
#include "objects/object_bubble/object_bubble.h"
#define FLAGS 0x00000001
@@ -51,8 +52,6 @@ static ColliderCylinderInit sCylinderInit = {
{ 16, 32, 0, { 0, 0, 0 } },
};
extern Gfx D_06001000[];
void EnElfbub_Init(Actor* thisx, GlobalContext* globalCtx) {
EnElfbub* this = THIS;
Actor* childActor;
@@ -162,7 +161,7 @@ void EnElfbub_Draw(Actor* thisx, GlobalContext* globalCtx2) {
Matrix_InsertZRotation_s(this->zRot * -1, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06001000);
gSPDisplayList(POLY_XLU_DISP++, object_bubble_DL_001000);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
+8 -10
View File
@@ -5,6 +5,8 @@
*/
#include "z_en_encount2.h"
#include "objects/object_fusen/object_fusen.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000010
@@ -97,17 +99,13 @@ static DamageTable sDamageTable = {
/* Powder Keg */ DMG_ENTRY(0, 0xF),
};
extern Gfx D_06000A00[];
extern Gfx D_06000D78[];
extern CollisionHeader D_06002420;
void EnEncount2_Init(Actor* thisx, GlobalContext* globalCtx) {
EnEncount2* this = THIS;
s32 pad;
CollisionHeader* colHeader = NULL;
DynaPolyActor_Init(&this->dyna, 0);
CollisionHeader_GetVirtual(&D_06002420, &colHeader);
CollisionHeader_GetVirtual(&object_fusen_Colheader_002420, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
ActorShape_Init(&this->dyna.actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
this->dyna.actor.colChkInfo.mass = MASS_IMMOVABLE;
@@ -209,8 +207,8 @@ void EnEncount2_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnEncount2_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnEncount2* this = THIS;
if (this->isPopped != true) {
Gfx_DrawDListOpa(globalCtx, D_06000A00);
Gfx_DrawDListOpa(globalCtx, D_06000D78);
Gfx_DrawDListOpa(globalCtx, object_fusen_DL_000A00);
Gfx_DrawDListOpa(globalCtx, object_fusen_DL_000D78);
}
EnEncount2_DrawParticles(this, globalCtx);
}
@@ -279,8 +277,8 @@ void EnEncount2_DrawParticles(EnEncount2* this, GlobalContext* globalCtx) {
Matrix_InsertTranslation(sPtr->pos.x, sPtr->pos.y, sPtr->pos.z, MTXMODE_NEW);
Matrix_Scale(sPtr->scale, sPtr->scale, sPtr->scale, MTXMODE_APPLY);
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 20);
gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(&D_04079B10));
gSPDisplayList(POLY_XLU_DISP++, D_0407AB10);
gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_079B10));
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_07AB10);
gDPPipeSync(POLY_XLU_DISP++);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(POLY_XLU_DISP++, 250, 180, 255, sPtr->alpha);
@@ -288,7 +286,7 @@ void EnEncount2_DrawParticles(EnEncount2* this, GlobalContext* globalCtx) {
Matrix_InsertZRotation_f(DEGTORAD(globalCtx->state.frames * 20.0f), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_0407AB58);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_07AB58);
}
}
CLOSE_DISPS(gfxCtx);
src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c
+11 -14
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_ending_hero.h"
#include "objects/object_dt/object_dt.h"
#define FLAGS 0x00000009
@@ -30,17 +31,6 @@ const ActorInit En_Ending_Hero_InitVars = {
(ActorFunc)EnEndingHero_Draw,
};
extern FlexSkeletonHeader D_0600B0CC;
extern AnimationHeader D_06000BE0;
extern UNK_PTR D_06007350[];
extern UNK_PTR D_06009590[];
extern UNK_PTR D_06009F90[];
extern UNK_PTR D_0600A790[];
extern UNK_PTR D_0600AB90[];
extern UNK_PTR D_06007750[];
extern UNK_PTR D_0600A390[];
extern UNK_PTR D_0600A490[];
void EnEndingHero_Init(Actor* thisx, GlobalContext* globalCtx) {
EnEndingHero* this = THIS;
@@ -48,7 +38,8 @@ void EnEndingHero_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.01f);
this->actor.targetMode = 6;
this->actor.gravity = -3.0f;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600B0CC, &D_06000BE0, this->jointTable, this->morphTable, 15);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dt_Skel_00B0CC, &object_dt_Anim_000BE0, this->jointTable,
this->morphTable, 15);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
func_80C1E748(this);
}
@@ -80,8 +71,14 @@ void EnEndingHero_Update(Actor* thisx, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 20.0f, 20.0f, 50.0f, 0x1D);
}
static UNK_PTR D_80C1E970[] = { D_06007350, D_06009590, D_06009F90, D_0600A790, D_0600AB90 };
static UNK_PTR D_80C1E984[] = { D_06007750, D_0600A390, D_0600A490 };
static TexturePtr D_80C1E970[] = {
object_dt_Tex_007350, object_dt_Tex_009590, object_dt_Tex_009F90, object_dt_Tex_00A790, object_dt_Tex_00AB90,
};
static TexturePtr D_80C1E984[] = {
object_dt_Tex_007750,
object_dt_Tex_00A390,
object_dt_Tex_00A490,
};
void EnEndingHero_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnEndingHero* this = THIS;
src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c
+3 -4
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_ending_hero2.h"
#include "objects/object_bai/object_bai.h"
#define FLAGS 0x00000009
@@ -30,9 +31,6 @@ const ActorInit En_Ending_Hero2_InitVars = {
(ActorFunc)EnEndingHero2_Draw,
};
extern FlexSkeletonHeader D_06007908;
extern AnimationHeader D_060011C0;
void EnEndingHero2_Init(Actor* thisx, GlobalContext* globalCtx) {
EnEndingHero2* this = THIS;
@@ -40,7 +38,8 @@ void EnEndingHero2_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.01f);
this->actor.targetMode = 6;
this->actor.gravity = -3.0f;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007908, &D_060011C0, this->jointTable, this->morphTable, 20);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_bai_Skel_007908, &object_bai_Anim_0011C0, this->jointTable,
this->morphTable, 20);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
func_80C232E8(this);
}
src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c
+3 -4
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_ending_hero3.h"
#include "objects/object_toryo/object_toryo.h"
#define FLAGS 0x00000009
@@ -30,9 +31,6 @@ const ActorInit En_Ending_Hero3_InitVars = {
(ActorFunc)EnEndingHero3_Draw,
};
extern FlexSkeletonHeader D_06007150;
extern AnimationHeader D_06000E50;
void EnEndingHero3_Init(Actor* thisx, GlobalContext* globalCtx) {
EnEndingHero3* this = THIS;
@@ -40,7 +38,8 @@ void EnEndingHero3_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.01f);
this->actor.targetMode = 6;
this->actor.gravity = -3.0f;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007150, &D_06000E50, this->jointTable, this->morphTable, 17);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_toryo_Skel_007150, &object_toryo_Anim_000E50,
this->jointTable, this->morphTable, 17);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
func_80C23518(this);
}
src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c
+3 -4
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_ending_hero4.h"
#include "objects/object_sdn/object_sdn.h"
#define FLAGS 0x00000009
@@ -30,9 +31,6 @@ const ActorInit En_Ending_Hero4_InitVars = {
(ActorFunc)EnEndingHero4_Draw,
};
extern FlexSkeletonHeader D_0600D640;
extern AnimationHeader D_06002A84;
void EnEndingHero4_Init(Actor* thisx, GlobalContext* globalCtx) {
EnEndingHero4* this = THIS;
@@ -40,7 +38,8 @@ void EnEndingHero4_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.01f);
this->actor.targetMode = 6;
this->actor.gravity = -3.0f;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600D640, &D_06002A84, this->jointTable, this->morphTable, 17);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_sdn_Skel_00D640, &object_sdn_Anim_002A84, this->jointTable,
this->morphTable, 17);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
func_80C23748(this);
}
src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c
+5 -11
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_ending_hero5.h"
#include "objects/object_daiku/object_daiku.h"
#define FLAGS 0x00000009
@@ -30,15 +31,6 @@ const ActorInit En_Ending_Hero5_InitVars = {
(ActorFunc)EnEndingHero5_Draw,
};
extern FlexSkeletonHeader D_0600A850;
extern AnimationHeader D_06002FA0;
extern Gfx D_060070C0[];
extern Gfx D_06006FB0[];
extern Gfx D_06006E80[];
extern Gfx D_06006D70[];
extern Gfx D_0600A390[];
void EnEndingHero5_Init(Actor* thisx, GlobalContext* globalCtx) {
EnEndingHero5* this = THIS;
@@ -46,7 +38,8 @@ void EnEndingHero5_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.01f);
this->actor.targetMode = 6;
this->actor.gravity = -3.0f;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600A850, &D_06002FA0, this->jointTable, this->morphTable, 17);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_002FA0,
this->jointTable, this->morphTable, 17);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
this->unk25C = this->actor.params;
func_80C23980(this);
@@ -72,7 +65,8 @@ void EnEndingHero5_Update(Actor* thisx, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 20.0f, 20.0f, 50.0f, 0x1D);
}
Gfx* D_80C23BF0[] = { D_060070C0, D_06006FB0, D_06006E80, D_06006D70, D_0600A390 };
Gfx* D_80C23BF0[] = { object_daiku_DL_0070C0, object_daiku_DL_006FB0, object_daiku_DL_006E80, object_daiku_DL_006D70,
object_daiku_DL_00A390 };
void EnEndingHero5_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
EnEndingHero5* this = THIS;
src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c
+20 -37
View File
@@ -5,6 +5,11 @@
*/
#include "z_en_ending_hero6.h"
#include "objects/object_dt/object_dt.h"
#include "objects/object_daiku/object_daiku.h"
#include "objects/object_bai/object_bai.h"
#include "objects/object_toryo/object_toryo.h"
#include "objects/object_sdn/object_sdn.h"
#define FLAGS 0x00000009
@@ -19,36 +24,6 @@ void EnEndingHero6_InitSkelAnime(EnEndingHero6* this, s32 npcIndex);
void EnEndingHero6_SetupIdle(EnEndingHero6* this);
void EnEndingHero6_Idle(EnEndingHero6* this, GlobalContext* globalCtx);
extern FlexSkeletonHeader D_0600B0CC; // object_dt
extern FlexSkeletonHeader D_06007908; // object_bai
extern FlexSkeletonHeader D_06007150; // object_toryo
extern FlexSkeletonHeader D_0600D640; // object_sdn
extern FlexSkeletonHeader D_0600A850; // object_daiku
extern AnimationHeader D_06000BE0; // object_dt
extern AnimationHeader D_060011C0; // object_bai
extern AnimationHeader D_06000E50; // object_toryo
extern AnimationHeader D_06002A84; // object_sdn
extern AnimationHeader D_06002FA0; // object_daiku
// object_daiku
extern Gfx D_060070C0[];
extern Gfx D_06006FB0[];
extern Gfx D_06006E80[];
extern Gfx D_06006D70[];
extern Gfx D_0600A390_dl[];
// object_dt
extern TexturePtr D_06007350;
extern TexturePtr D_06009590;
extern TexturePtr D_06009F90;
extern TexturePtr D_0600A790;
extern TexturePtr D_0600AB90;
extern TexturePtr D_06007750;
extern TexturePtr D_0600A390_tex;
extern TexturePtr D_0600A490;
const ActorInit En_Ending_Hero6_InitVars = {
ACTOR_EN_ENDING_HERO6,
ACTORCAT_NPC,
@@ -61,11 +36,17 @@ const ActorInit En_Ending_Hero6_InitVars = {
(ActorFunc)EnEndingHero6_Draw,
};
static FlexSkeletonHeader* sSkeletons[] = { &D_0600B0CC, &D_06007908, &D_06007150, &D_0600D640, &D_0600A850,
&D_0600A850, &D_0600A850, &D_0600A850, &D_0600A850 };
static FlexSkeletonHeader* sSkeletons[] = {
&object_dt_Skel_00B0CC, &object_bai_Skel_007908, &object_toryo_Skel_007150,
&object_sdn_Skel_00D640, &object_daiku_Skel_00A850, &object_daiku_Skel_00A850,
&object_daiku_Skel_00A850, &object_daiku_Skel_00A850, &object_daiku_Skel_00A850,
};
static AnimationHeader* sAnimations[] = { &D_06000BE0, &D_060011C0, &D_06000E50, &D_06002A84, &D_06002FA0,
&D_06002FA0, &D_06002FA0, &D_06002FA0, &D_06002FA0 };
static AnimationHeader* sAnimations[] = {
&object_dt_Anim_000BE0, &object_bai_Anim_0011C0, &object_toryo_Anim_000E50,
&object_sdn_Anim_002A84, &object_daiku_Anim_002FA0, &object_daiku_Anim_002FA0,
&object_daiku_Anim_002FA0, &object_daiku_Anim_002FA0, &object_daiku_Anim_002FA0,
};
static s32 sLimbCounts[] = { 15, 20, 17, 17, 17, 17, 17, 17, 17 };
@@ -124,7 +105,8 @@ void EnEndingHero6_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void EnEndingHero6_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
static Gfx* D_80C2426C[] = { D_060070C0, D_06006FB0, D_06006E80, D_06006D70, D_0600A390_dl };
static Gfx* D_80C2426C[] = { object_daiku_DL_0070C0, object_daiku_DL_006FB0, object_daiku_DL_006E80,
object_daiku_DL_006D70, object_daiku_DL_00A390 };
EnEndingHero6* this = THIS;
s32 index;
@@ -139,8 +121,9 @@ void EnEndingHero6_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d
}
void EnEndingHero6_Draw(Actor* thisx, GlobalContext* globalCtx) {
static TexturePtr D_80C24280[] = { &D_06007350, &D_06009590, &D_06009F90, &D_0600A790, &D_0600AB90 };
static TexturePtr D_80C24294[] = { &D_06007750, &D_0600A390_tex, &D_0600A490 };
static TexturePtr D_80C24280[] = { object_dt_Tex_007350, object_dt_Tex_009590, object_dt_Tex_009F90,
object_dt_Tex_00A790, object_dt_Tex_00AB90 };
static TexturePtr D_80C24294[] = { object_dt_Tex_007750, object_dt_Tex_00A390, object_dt_Tex_00A490 };
s32 pad;
EnEndingHero6* this = THIS;
s32 index = 0;
src/overlays/actors/ovl_En_Fall/z_en_fall.c
+3 -3
View File
@@ -516,7 +516,7 @@ void EnFall_FireBall_SetPerVertexAlpha(f32 fireBallAlpha) {
s32 pad;
u8 perVertexAlphaTable[5];
Vtx* vertices = Lib_SegmentedToVirtual(&object_fall_Vtx_0004C0);
Vtx* vertices = Lib_SegmentedToVirtual(object_fall_Vtx_0004C0);
s32 i;
if (fireBallAlpha > 1.0f) {
@@ -832,7 +832,7 @@ void EnFall_FireRing_Draw(Actor* thisx, GlobalContext* globalCtx) {
this->fireRingAlpha = 1.0f;
}
OPEN_DISPS(globalCtx->state.gfxCtx);
AnimatedMat_DrawXlu(globalCtx, Lib_SegmentedToVirtual(&object_fall_Matanimheader_004E38));
AnimatedMat_DrawXlu(globalCtx, Lib_SegmentedToVirtual(object_fall_Matanimheader_004E38));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_8012C2DC(globalCtx->state.gfxCtx);
gDPSetColorDither(POLY_XLU_DISP++, G_CD_NOISE);
@@ -847,7 +847,7 @@ void EnFall_MoonsTear_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_moonston_Matanimheader_001220));
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_moonston_Matanimheader_001220));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_8012C28C(globalCtx->state.gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, object_moonston_DL_000400);
src/overlays/actors/ovl_En_Fg/z_en_fg.c
+13 -18
View File
@@ -5,6 +5,8 @@
*/
#include "z_en_fg.h"
#include "objects/object_fr/object_fr.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00004209
@@ -22,14 +24,6 @@ void EnFg_AddDust(EnFgEffectDust* dustEffect, Vec3f* worldPos);
void EnFg_UpdateDust(EnFgEffectDust* dustEffect);
void EnFg_DrawDust(GlobalContext* globalCtx, EnFgEffectDust* dustEffect);
extern AnimationHeader D_06001534;
extern AnimationHeader D_060011C0;
extern AnimationHeader D_060007BC;
extern Gfx* D_060059A0[];
extern Gfx* D_0600B328[];
extern Gfx* D_0600B338[];
extern FlexSkeletonHeader D_0600B538;
const ActorInit En_Fg_InitVars = {
ACTOR_EN_FG,
ACTORCAT_NPC,
@@ -102,10 +96,10 @@ static DamageTable sDamageTable = {
};
static ActorAnimationEntryS sAnimations[] = {
{ &D_06001534, 1.0f, 0, -1, 0, 0 },
{ &D_06001534, 1.0f, 0, -1, 0, -4 },
{ &D_060011C0, 1.0f, 0, -1, 0, -4 },
{ &D_060007BC, 1.0f, 0, -1, 2, -4 },
{ &object_fr_Anim_001534, 1.0f, 0, -1, 0, 0 },
{ &object_fr_Anim_001534, 1.0f, 0, -1, 0, -4 },
{ &object_fr_Anim_0011C0, 1.0f, 0, -1, 0, -4 },
{ &object_fr_Anim_0007BC, 1.0f, 0, -1, 2, -4 },
};
s32 EnFg_UpdateAnimation(SkelAnime* skelAnime, s16 animIndex) {
@@ -321,7 +315,8 @@ void EnFg_Init(Actor* thisx, GlobalContext* globalCtx) {
EnFg* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 10.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600B538, NULL, this->jointTable, this->morphTable, 24);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_fr_Skel_00B538, NULL, this->jointTable, this->morphTable,
24);
EnFg_UpdateAnimation(&this->skelAnime, 0);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
@@ -412,8 +407,8 @@ void EnFg_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, envColor[this->actor.params].r, envColor[this->actor.params].g,
envColor[this->actor.params].b, envColor[this->actor.params].a);
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&D_060059A0));
gSPSegment(POLY_OPA_DISP++, 0x09, Lib_SegmentedToVirtual(&D_060059A0));
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(object_fr_Tex_0059A0));
gSPSegment(POLY_OPA_DISP++, 0x09, Lib_SegmentedToVirtual(object_fr_Tex_0059A0));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnFg_OverrideLimbDraw, EnFg_PostLimbDraw, &this->actor);
CLOSE_DISPS(globalCtx->state.gfxCtx);
@@ -451,7 +446,7 @@ void EnFg_UpdateDust(EnFgEffectDust* dustEffect) {
}
TexturePtr sDustTex[] = {
D_0408F7E0, D_0408F3E0, D_0408EFE0, D_0408EBE0, D_0408E7E0, D_0408E3E0, D_0408DFE0, D_0408DBE0,
gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex,
};
void EnFg_DrawDust(GlobalContext* globalCtx, EnFgEffectDust* dustEffect) {
@@ -467,7 +462,7 @@ void EnFg_DrawDust(GlobalContext* globalCtx, EnFgEffectDust* dustEffect) {
if (dustEffect->type) {
if (!firstDone) {
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0);
gSPDisplayList(POLY_XLU_DISP++, D_0600B328);
gSPDisplayList(POLY_XLU_DISP++, object_fr_DL_00B328);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, 0);
firstDone = true;
}
@@ -483,7 +478,7 @@ void EnFg_DrawDust(GlobalContext* globalCtx, EnFgEffectDust* dustEffect) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
index = 0.5f * dustEffect->timer;
gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(sDustTex[index]));
gSPDisplayList(POLY_XLU_DISP++, D_0600B338);
gSPDisplayList(POLY_XLU_DISP++, object_fr_DL_00B338);
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
+5 -7
View File
@@ -6,6 +6,7 @@
#include "z_en_firefly.h"
#include "overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h"
#include "objects/object_firefly/object_firefly.h"
#define FLAGS 0x00005005
@@ -119,16 +120,13 @@ static InitChainEntry sInitChain[] = {
ICHAIN_F32(targetArrowOffset, 4000, ICHAIN_STOP),
};
extern AnimationHeader D_0600017C;
extern SkeletonHeader D_060018B8;
extern Gfx D_06001678[];
void EnFirefly_Init(Actor* thisx, GlobalContext* globalCtx) {
EnFirefly* this = THIS;
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
SkelAnime_Init(globalCtx, &this->skelAnime, &D_060018B8, &D_0600017C, this->jointTable, this->morphTable, 28);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_firefly_Skel_0018B8, &object_firefly_Anim_00017C,
this->jointTable, this->morphTable, 28);
Collider_InitAndSetSphere(globalCtx, &this->collider, &this->actor, &sSphereInit);
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
@@ -331,7 +329,7 @@ void EnFirefly_FlyIdle(EnFirefly* this, GlobalContext* globalCtx) {
void EnFirefly_SetupFall(EnFirefly* this, GlobalContext* globalCtx) {
this->timer = 40;
this->actor.velocity.y = 0.0f;
Animation_Change(&this->skelAnime, &D_0600017C, 0.0f, 6.0f, 6.0f, 2, 0.0f);
Animation_Change(&this->skelAnime, &object_firefly_Anim_00017C, 0.0f, 6.0f, 6.0f, 2, 0.0f);
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FFLY_DEAD);
this->actor.flags |= 0x10;
@@ -757,7 +755,7 @@ void EnFirefly_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList
EnFirefly* this = THIS;
if ((this->currentType != KEESE_FIRE) && (limbIndex == 27)) {
gSPDisplayList((*gfx)++, D_06001678);
gSPDisplayList((*gfx)++, object_firefly_DL_001678);
} else if ((this->unk_2F4 != globalCtx->gameplayFrames) &&
((this->auraType == KEESE_AURA_FIRE) || (this->auraType == KEESE_AURA_ICE)) &&
((limbIndex == 15) || (limbIndex == 21))) {
src/overlays/actors/ovl_En_Fish2/z_en_fish2.c
+10 -14
View File
@@ -7,6 +7,8 @@
#include "overlays/actors/ovl_En_Fish/z_en_fish.h"
#include "overlays/actors/ovl_En_Mushi2/z_en_mushi2.h"
#include "z_en_fish2.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_fb/object_fb.h"
#define FLAGS 0x00000019
@@ -40,13 +42,6 @@ void func_80B2ADB0(EnFish2* this, Vec3f* vec, s16 arg2);
void func_80B2AF80(EnFish2* this, GlobalContext* globalCtx);
void func_80B2B180(EnFish2* this, GlobalContext* globalCtx);
extern AnimationHeader D_060006D8;
extern AnimationHeader D_060007D4;
extern AnimationHeader D_06000ACC;
extern AnimationHeader D_06001174;
extern AnimationHeader D_060013AC;
extern FlexSkeletonHeader D_06006190;
static s32 D_80B2B2E0 = 0;
static s32 D_80B2B2E4 = 0;
static s32 D_80B2B2E8 = 0;
@@ -109,7 +104,8 @@ static f32 D_80B2B380[] = { 0.019f, 0.033f };
void func_80B28370(EnFish2* this, s32 arg0) {
static AnimationHeader* D_80B2B388[] = {
&D_060013AC, &D_060007D4, &D_060006D8, &D_060006D8, &D_06001174, &D_06000ACC,
&object_fb_Anim_0013AC, &object_fb_Anim_0007D4, &object_fb_Anim_0006D8,
&object_fb_Anim_0006D8, &object_fb_Anim_001174, &object_fb_Anim_000ACC,
};
static u8 D_80B2B3A0[] = { 0, 0, 2, 2, 2, 2 };
f32 sp34;
@@ -161,8 +157,8 @@ void EnFish2_Init(Actor* thisx, GlobalContext* globalCtx) {
if (this->actor.params == 0) {
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06006190, &D_060013AC, this->jointTable, this->morphTable,
24);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_fb_Skel_006190, &object_fb_Anim_0013AC,
this->jointTable, this->morphTable, 24);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
if (this->unk_344 == 0) {
if (gSaveContext.weekEventReg[81] & 0x10) {
@@ -1095,12 +1091,12 @@ void func_80B2ADB0(EnFish2* this, Vec3f* vec, s16 arg2) {
for (i = 0; i < ARRAY_COUNT(this->unk_3F8); i++, ptr++) {
if (!ptr->unk_00) {
u32 phi_v0;
TexturePtr phi_v0;
if (Rand_ZeroOne() < 0.5f) {
phi_v0 = &D_04091CE0;
phi_v0 = gameplay_keep_Tex_091CE0;
} else {
phi_v0 = &D_04091BE0;
phi_v0 = gameplay_keep_Tex_091BE0;
}
ptr->unk_20 = VIRTUAL_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(phi_v0));
@@ -1172,7 +1168,7 @@ void func_80B2B180(EnFish2* this, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(POLY_OPA_DISP++, 150, 150, 150, 0);
gSPSegment(POLY_OPA_DISP++, 0x08, ptr->unk_20);
gSPDisplayList(POLY_OPA_DISP++, D_040301B0);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_0301B0);
}
}
src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
+27 -36
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_floormas.h"
#include "objects/object_wallmaster/object_wallmaster.h"
#define FLAGS 0x00000405
@@ -59,19 +60,6 @@ void func_808D2D30(EnFloormas* this, GlobalContext* globalCtx);
void func_808D2DC0(EnFloormas* this, GlobalContext* globalCtx);
void func_808D3754(Actor* thisx, GlobalContext* globalCtx);
extern AnimationHeader D_06000590;
extern AnimationHeader D_06000EA4;
extern AnimationHeader D_060019CC;
extern AnimationHeader D_06002158;
extern AnimationHeader D_060039B0;
extern AnimationHeader D_060041F4;
extern Gfx D_06008688[];
extern FlexSkeletonHeader D_06008FB0;
extern AnimationHeader D_06009244;
extern AnimationHeader D_06009520;
extern AnimationHeader D_06009DB0;
extern AnimationHeader D_0600A054;
const ActorInit En_Floormas_InitVars = {
ACTOR_EN_FLOORMAS,
ACTORCAT_ENEMY,
@@ -166,7 +154,8 @@ void EnFloormas_Init(Actor* thisx, GlobalContext* globalCtx2) {
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 50.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06008FB0, &D_06009DB0, this->jointTable, this->morphTable, 25);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_wallmaster_Skel_008FB0, &object_wallmaster_Anim_009DB0,
this->jointTable, this->morphTable, 25);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
@@ -270,7 +259,7 @@ void func_808D0A48(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D0B08(EnFloormas* this) {
Animation_PlayOnce(&this->skelAnime, &D_06009DB0);
Animation_PlayOnce(&this->skelAnime, &object_wallmaster_Anim_009DB0);
this->actor.speedXZ = 0.0f;
this->actionFunc = func_808D0B50;
}
@@ -289,7 +278,7 @@ void func_808D0B50(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D0C14(EnFloormas* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_0600A054, -3.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_wallmaster_Anim_00A054, -3.0f);
this->actionFunc = func_808D0C58;
}
@@ -307,7 +296,7 @@ void func_808D0C58(EnFloormas* this, GlobalContext* globalCtx) {
void func_808D0CE4(EnFloormas* this) {
if (this->actionFunc != func_808D0F80) {
Animation_PlayLoopSetSpeed(&this->skelAnime, &D_060041F4, 1.5f);
Animation_PlayLoopSetSpeed(&this->skelAnime, &object_wallmaster_Anim_0041F4, 1.5f);
} else {
this->skelAnime.playSpeed = 1.5f;
}
@@ -345,7 +334,7 @@ void func_808D0D70(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D0ECC(EnFloormas* this) {
Animation_PlayOnce(&this->skelAnime, &D_06009244);
Animation_PlayOnce(&this->skelAnime, &object_wallmaster_Anim_009244);
this->actor.speedXZ = 0.0f;
this->actionFunc = func_808D0F14;
}
@@ -384,10 +373,10 @@ void func_808D108C(EnFloormas* this) {
this->actor.speedXZ = 0.0f;
if (sp36 > 0) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06002158, -3.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_wallmaster_Anim_002158, -3.0f);
} else {
Animation_Change(&this->skelAnime, &D_06002158, -1.0f, Animation_GetLastFrame(&D_06002158.common), 0.0f, 2,
-3.0f);
Animation_Change(&this->skelAnime, &object_wallmaster_Anim_002158, -1.0f,
Animation_GetLastFrame(&object_wallmaster_Anim_002158.common), 0.0f, 2, -3.0f);
}
if (this->actor.scale.x > 0.009f) {
@@ -429,7 +418,8 @@ void func_808D11BC(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D1380(EnFloormas* this, GlobalContext* globalCtx) {
Animation_Change(&this->skelAnime, &D_06009520, 3.0f, 0.0f, Animation_GetLastFrame(&D_06009520.common), 2, -3.0f);
Animation_Change(&this->skelAnime, &object_wallmaster_Anim_009520, 3.0f, 0.0f,
Animation_GetLastFrame(&object_wallmaster_Anim_009520.common), 2, -3.0f);
this->actor.speedXZ = 0.0f;
this->actor.gravity = 0.0f;
func_808D08D0(this);
@@ -502,7 +492,7 @@ void func_808D1650(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D1740(EnFloormas* this) {
Animation_Change(&this->skelAnime, &D_060019CC, 1.0f, 41.0f, 42.0f, 2, 5.0f);
Animation_Change(&this->skelAnime, &object_wallmaster_Anim_0019CC, 1.0f, 41.0f, 42.0f, 2, 5.0f);
if ((this->actor.speedXZ < 0.0f) || (this->actionFunc != func_808D1650)) {
this->unk_18E = 30;
} else {
@@ -548,7 +538,7 @@ void func_808D17EC(EnFloormas* this, GlobalContext* globalCtx) {
if ((this->unk_18E == 0) && (sp24 != 0)) {
if (this->skelAnime.endFrame < 45.0f) {
this->skelAnime.endFrame = Animation_GetLastFrame(&D_060019CC.common);
this->skelAnime.endFrame = Animation_GetLastFrame(&object_wallmaster_Anim_0019CC.common);
} else if (this->actor.params == ENFLOORMAS_GET_7FFF_40) {
func_808D2700(this);
} else {
@@ -579,7 +569,8 @@ void func_808D19D4(EnFloormas* this) {
this->actor.shape.rot.y = parent->shape.rot.y + 0x5555;
this->actor.world.pos = parent->world.pos;
this->actor.params = ENFLOORMAS_GET_7FFF_10;
Animation_Change(&this->skelAnime, &D_060019CC, 1.0f, 41.0f, Animation_GetLastFrame(&D_060019CC.common), 2, 0.0f);
Animation_Change(&this->skelAnime, &object_wallmaster_Anim_0019CC, 1.0f, 41.0f,
Animation_GetLastFrame(&object_wallmaster_Anim_0019CC.common), 2, 0.0f);
this->collider.dim.radius = sCylinderInit.dim.radius * 0.6f;
this->collider.dim.height = sCylinderInit.dim.height * 0.6f;
this->actor.flags &= ~0x400;
@@ -605,7 +596,7 @@ void func_808D1B44(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D1BCC(EnFloormas* this) {
Animation_PlayLoopSetSpeed(&this->skelAnime, &D_060041F4, 4.5f);
Animation_PlayLoopSetSpeed(&this->skelAnime, &object_wallmaster_Anim_0041F4, 4.5f);
this->actor.speedXZ = 5.0f;
this->actionFunc = func_808D1C1C;
}
@@ -632,7 +623,7 @@ void func_808D1C1C(EnFloormas* this, GlobalContext* globalCtx) {
void func_808D1D0C(EnFloormas* this) {
if (this->actionFunc != func_808D1C1C) {
Animation_PlayLoopSetSpeed(&this->skelAnime, &D_060041F4, 4.5f);
Animation_PlayLoopSetSpeed(&this->skelAnime, &object_wallmaster_Anim_0041F4, 4.5f);
}
this->actor.speedXZ = 5.0f;
this->actionFunc = func_808D1D6C;
@@ -695,7 +686,7 @@ void func_808D1F7C(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D1FD4(EnFloormas* this) {
Animation_Change(&this->skelAnime, &D_060019CC, 2.0f, 0.0f, 41.0f, 2, 0.0f);
Animation_Change(&this->skelAnime, &object_wallmaster_Anim_0019CC, 2.0f, 0.0f, 41.0f, 2, 0.0f);
this->actor.speedXZ = 0.0f;
this->actionFunc = func_808D2040;
}
@@ -725,7 +716,7 @@ void func_808D217C(EnFloormas* this, Player* player) {
Vec3f* ptr;
u8 playerForm;
Animation_Change(&this->skelAnime, &D_060019CC, 1.0f, 36.0f, 45.0f, 2, -3.0f);
Animation_Change(&this->skelAnime, &object_wallmaster_Anim_0019CC, 1.0f, 36.0f, 45.0f, 2, -3.0f);
this->actor.flags &= ~1;
this->actor.speedXZ = 0.0f;
this->actor.velocity.y = 0.0f;
@@ -781,7 +772,7 @@ void func_808D22C8(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D2484(EnFloormas* this) {
Animation_Change(&this->skelAnime, &D_060019CC, 2.0f, 0.0f, 41.0f, 2, 0.0f);
Animation_Change(&this->skelAnime, &object_wallmaster_Anim_0019CC, 2.0f, 0.0f, 41.0f, 2, 0.0f);
this->actor.speedXZ = 0.0f;
this->actionFunc = func_808D24F0;
}
@@ -825,7 +816,7 @@ void func_808D24F0(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D2700(EnFloormas* this) {
Animation_PlayOnce(&this->skelAnime, &D_06009DB0);
Animation_PlayOnce(&this->skelAnime, &object_wallmaster_Anim_009DB0);
this->unk_18E = 0;
this->unk_194 = 1500;
this->actor.params = ENFLOORMAS_GET_7FFF_40;
@@ -890,10 +881,10 @@ void func_808D2764(EnFloormas* this, GlobalContext* globalCtx) {
this->actor.colChkInfo.health = sColChkInfoInit.health;
func_808D0C14(this);
} else if (this->unk_18E == 0) {
Animation_PlayOnce(&this->skelAnime, &D_060039B0);
Animation_PlayOnce(&this->skelAnime, &object_wallmaster_Anim_0039B0);
this->unk_18E = 1;
} else {
Animation_PlayOnce(&this->skelAnime, &D_06009DB0);
Animation_PlayOnce(&this->skelAnime, &object_wallmaster_Anim_009DB0);
this->unk_18E = 0;
}
}
@@ -933,7 +924,7 @@ void func_808D2AF4(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D2B18(EnFloormas* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06000590, -3.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_wallmaster_Anim_000590, -3.0f);
func_800BE504(&this->actor, &this->collider);
Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 20);
this->actor.speedXZ = 5.0f;
@@ -976,7 +967,7 @@ void func_808D2C08(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D2CDC(EnFloormas* this) {
Animation_PlayOnce(&this->skelAnime, &D_06000EA4);
Animation_PlayOnce(&this->skelAnime, &object_wallmaster_Anim_000EA4);
this->actor.speedXZ = 0.0f;
this->actor.velocity.y = 0.0f;
this->actor.world.rot.y = this->actor.shape.rot.y;
@@ -1187,7 +1178,7 @@ void EnFloormas_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY);
gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList((*gfx)++, D_06008688);
gSPDisplayList((*gfx)++, object_wallmaster_DL_008688);
Matrix_StatePop();
}
src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
+18 -32
View File
@@ -5,6 +5,8 @@
*/
#include "z_en_fsn.h"
#include "objects/object_fsn/object_fsn.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000019
@@ -45,25 +47,6 @@ void EnFsn_SelectItem(EnFsn* this, GlobalContext* globalCtx);
void EnFsn_LookToShopkeeperFromShelf(EnFsn* this, GlobalContext* globalCtx);
void EnFsn_PlayerCannotBuy(EnFsn* this, GlobalContext* globalCtx);
extern AnimationHeader D_06012C34;
extern AnimationHeader D_060131FC;
extern AnimationHeader D_0600C58C;
extern AnimationHeader D_0600E3EC;
extern AnimationHeader D_0600F00C;
extern AnimationHeader D_0600CB3C;
extern AnimationHeader D_0600D354;
extern AnimationHeader D_060138B0;
extern AnimationHeader D_0601430C;
extern AnimationHeader D_0600B9D8;
extern AnimationHeader D_0600C26C;
extern AnimationHeader D_0600DE34;
extern FlexSkeletonHeader D_06013320;
extern UNK_TYPE D_06005BC0;
extern UNK_TYPE D_06006D40;
extern UNK_TYPE D_06007140;
extern Gfx D_0600F180[];
extern Gfx D_0600F218[];
const ActorInit En_Fsn_InitVars = {
ACTOR_EN_FSN,
ACTORCAT_NPC,
@@ -77,11 +60,13 @@ const ActorInit En_Fsn_InitVars = {
};
static ActorAnimationEntryS sAnimations[] = {
{ &D_06012C34, 1.0f, 0, -1, 0, 0 }, { &D_060131FC, 1.0f, 0, -1, 0, 0 }, { &D_0600C58C, 1.0f, 0, -1, 2, 0 },
{ &D_0600C58C, -1.0f, 0, -1, 2, 0 }, { &D_0600E3EC, 1.0f, 0, -1, 2, 0 }, { &D_0600F00C, 1.0f, 0, -1, 0, 0 },
{ &D_0600CB3C, 1.0f, 0, -1, 2, 0 }, { &D_0600D354, 1.0f, 0, -1, 0, 0 }, { &D_060138B0, 1.0f, 0, -1, 2, 0 },
{ &D_0601430C, 1.0f, 0, -1, 0, 0 }, { &D_0600B9D8, 1.0f, 0, -1, 2, 0 }, { &D_0600C26C, 1.0f, 0, -1, 0, 0 },
{ &D_0600DE34, 1.0f, 0, -1, 2, 0 },
{ &object_fsn_Anim_012C34, 1.0f, 0, -1, 0, 0 }, { &object_fsn_Anim_0131FC, 1.0f, 0, -1, 0, 0 },
{ &object_fsn_Anim_00C58C, 1.0f, 0, -1, 2, 0 }, { &object_fsn_Anim_00C58C, -1.0f, 0, -1, 2, 0 },
{ &object_fsn_Anim_00E3EC, 1.0f, 0, -1, 2, 0 }, { &object_fsn_Anim_00F00C, 1.0f, 0, -1, 0, 0 },
{ &object_fsn_Anim_00CB3C, 1.0f, 0, -1, 2, 0 }, { &object_fsn_Anim_00D354, 1.0f, 0, -1, 0, 0 },
{ &object_fsn_Anim_0138B0, 1.0f, 0, -1, 2, 0 }, { &object_fsn_Anim_01430C, 1.0f, 0, -1, 0, 0 },
{ &object_fsn_Anim_00B9D8, 1.0f, 0, -1, 2, 0 }, { &object_fsn_Anim_00C26C, 1.0f, 0, -1, 0, 0 },
{ &object_fsn_Anim_00DE34, 1.0f, 0, -1, 2, 0 },
};
static ColliderCylinderInit sCylinderInit = {
@@ -1400,7 +1385,8 @@ void EnFsn_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013320, &D_06012C34, this->jointTable, this->morphTable, 19);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_fsn_Skel_013320, &object_fsn_Anim_012C34, this->jointTable,
this->morphTable, 19);
if (ENFSN_IS_SHOP(&this->actor)) {
this->actor.shape.rot.y = BINANG_ROT180(this->actor.shape.rot.y);
this->actor.flags &= ~1;
@@ -1460,8 +1446,8 @@ void EnFsn_DrawCursor(EnFsn* this, GlobalContext* globalCtx, f32 x, f32 y, f32 z
func_8012C654(globalCtx->state.gfxCtx);
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, this->cursorColor.r, this->cursorColor.g, this->cursorColor.b,
this->cursorColor.a);
gDPLoadTextureBlock_4b(OVERLAY_DISP++, &D_0401F740, G_IM_FMT_IA, 16, 16, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);
gDPLoadTextureBlock_4b(OVERLAY_DISP++, gameplay_keep_Tex_01F740, G_IM_FMT_IA, 16, 16, 0,
G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);
w = 16.0f * z;
ulx = (x - w) * 4.0f;
uly = (y - w + -12.0f) * 4.0f;
@@ -1508,7 +1494,7 @@ void EnFsn_DrawStickDirectionPrompts(EnFsn* this, GlobalContext* globalCtx) {
if (drawStickRightPrompt || drawStickLeftPrompt) {
func_8012C654(globalCtx->state.gfxCtx);
gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, &D_0401F8C0);
gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, gameplay_keep_Tex_01F8C0);
gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOLOD);
gDPLoadSync(OVERLAY_DISP++);
@@ -1529,7 +1515,7 @@ void EnFsn_DrawStickDirectionPrompts(EnFsn* this, GlobalContext* globalCtx) {
this->stickRightPrompt.arrowTexX, this->stickRightPrompt.arrowTexY,
this->stickRightPrompt.texZ, 0, 0, 1.0f, 1.0f);
}
gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, &D_0401F7C0);
gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, gameplay_keep_Tex_01F7C0);
gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOLOD);
gDPLoadSync(OVERLAY_DISP++);
@@ -1599,14 +1585,14 @@ void EnFsn_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
this->actor.focus.pos.z = this->actor.world.pos.z;
OPEN_DISPS(globalCtx->state.gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, D_0600F180);
gSPDisplayList(POLY_OPA_DISP++, D_0600F218);
gSPDisplayList(POLY_OPA_DISP++, object_fsn_DL_00F180);
gSPDisplayList(POLY_OPA_DISP++, object_fsn_DL_00F218);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
void EnFsn_Draw(Actor* thisx, GlobalContext* globalCtx) {
static TexturePtr sEyeTextures[] = { &D_06005BC0, &D_06006D40, &D_06007140 };
static TexturePtr sEyeTextures[] = { object_fsn_Tex_005BC0, object_fsn_Tex_006D40, object_fsn_Tex_007140 };
EnFsn* this = THIS;
s32 pad;
s16 i;
src/overlays/actors/ovl_En_Fu/z_en_fu.c
+11 -19
View File
@@ -10,6 +10,8 @@
#include "overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.h"
#include "overlays/actors/ovl_En_Bom/z_en_bom.h"
#include "z_en_fu.h"
#include "objects/object_mu/object_mu.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x0A000019
@@ -54,16 +56,6 @@ void func_80964694(EnFu* this, EnFuUnkStruct* ptr, Vec3f* arg2, s32 len);
void func_809647EC(GlobalContext* globalCtx, EnFuUnkStruct* ptr, s32 len);
void func_80964950(GlobalContext* globalCtx, EnFuUnkStruct* ptr, s32 len);
extern AnimationHeader D_06001F74;
extern AnimationHeader D_06002F64;
extern AnimationHeader D_06004904;
extern AnimationHeader D_06005304;
extern AnimationHeader D_060053E0;
extern Gfx D_0600B0A0[];
extern Gfx D_0600B0E0[];
extern FlexSkeletonHeader D_0600B2B0;
extern AnimationHeader D_0600BAC4;
const ActorInit En_Fu_InitVars = {
ACTOR_EN_FU,
ACTORCAT_NPC,
@@ -83,10 +75,10 @@ static Vec3f D_80964B18 = { 0.0f, 55.0f, 12.0f };
static Vec3f D_80964B24 = { 0.0f, 60.0f, 0.0f };
static ActorAnimationEntry sAnimations[] = {
{ &D_060053E0, 1.0f, 0.0f, 0.0f, 0, -4.0f }, { &D_06001F74, 1.0f, 0.0f, 0.0f, 0, -4.0f },
{ &D_06002F64, 1.0f, 0.0f, 0.0f, 0, -4.0f }, { &D_06004904, 1.0f, 0.0f, 0.0f, 0, 0.0f },
{ &D_06005304, 1.0f, 0.0f, 0.0f, 0, -8.0f }, { &D_06005304, 1.0f, 0.0f, 0.0f, 0, 0.0f },
{ &D_0600BAC4, 1.0f, 0.0f, 0.0f, 2, 0.0f },
{ &object_mu_Anim_0053E0, 1.0f, 0.0f, 0.0f, 0, -4.0f }, { &object_mu_Anim_001F74, 1.0f, 0.0f, 0.0f, 0, -4.0f },
{ &object_mu_Anim_002F64, 1.0f, 0.0f, 0.0f, 0, -4.0f }, { &object_mu_Anim_004904, 1.0f, 0.0f, 0.0f, 0, 0.0f },
{ &object_mu_Anim_005304, 1.0f, 0.0f, 0.0f, 0, -8.0f }, { &object_mu_Anim_005304, 1.0f, 0.0f, 0.0f, 0, 0.0f },
{ &object_mu_Anim_00BAC4, 1.0f, 0.0f, 0.0f, 2, 0.0f },
};
static ColliderCylinderInit sCylinderInit = {
@@ -200,8 +192,8 @@ void EnFu_Init(Actor* thisx, GlobalContext* globalCtx) {
if (fuKaiten != NULL) {
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600B2B0, &D_06001F74, this->jointTable, this->morphTable,
21);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_mu_Skel_00B2B0, &object_mu_Anim_001F74,
this->jointTable, this->morphTable, 21);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
@@ -1459,17 +1451,17 @@ void func_80964950(GlobalContext* globalCtx, EnFuUnkStruct* ptr, s32 len) {
for (i = 0; i < len; i++, ptr++) {
if (ptr->unk_36 == 1) {
if (!flag) {
gSPDisplayList(POLY_OPA_DISP++, D_0600B0A0);
gSPDisplayList(POLY_OPA_DISP++, object_mu_DL_00B0A0);
flag = true;
}
Matrix_InsertTranslation(ptr->unk_08.x, ptr->unk_08.y, ptr->unk_08.z, MTXMODE_NEW);
Matrix_NormalizeXYZ(&globalCtx->billboardMtxF);
Matrix_Scale(ptr->unk_00, ptr->unk_00, ptr->unk_00, MTXMODE_APPLY);
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&D_0405E6F0));
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_05E6F0));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_0600B0E0);
gSPDisplayList(POLY_OPA_DISP++, object_mu_DL_00B0E0);
}
}
src/overlays/actors/ovl_En_Geg/z_en_geg.c
+4 -4
View File
@@ -1025,10 +1025,10 @@ void EnGeg_TransformLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* thi
void func_80BB3BE0(EnGeg* this, GlobalContext* globalCtx) {
static TexturePtr D_80BB4088[] = {
&object_oF1d_map_Tex_010438,
&object_oF1d_map_Tex_010C38,
&object_oF1d_map_Tex_011038,
&object_oF1d_map_Tex_010838,
object_oF1d_map_Tex_010438,
object_oF1d_map_Tex_010C38,
object_oF1d_map_Tex_011038,
object_oF1d_map_Tex_010838,
};
s32 pad;
src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
+14 -19
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_ginko_man.h"
#include "objects/object_boj/object_boj.h"
#define FLAGS 0x00000009
@@ -29,14 +30,6 @@ void EnGinkoMan_Stamp(EnGinkoMan* this, GlobalContext* globalCtx);
void EnGinkoMan_Dialogue(EnGinkoMan* this, GlobalContext* globalCtx);
void EnGinkoMan_SwitchAnimation(EnGinkoMan* this, GlobalContext* globalCtx);
extern FlexSkeletonHeader D_0600C240; // object_ginko_skeleton
extern Gfx D_0600B1D8[]; // object_ginko_limb15_dlist
extern AnimationHeader D_060008C0; // object_ginko_floorsmacking_anim
extern AnimationHeader D_060043F0; // object_ginko_sitting_anim
extern AnimationHeader D_06004A7C; // object_ginko_amazed_anim
extern AnimationHeader D_06004F40; // object_ginko_stamp_reach_anim
extern AnimationHeader D_06000AC4; // object_ginko_advertising_anim
const ActorInit En_Ginko_Man_InitVars = {
ACTOR_EN_GINKO_MAN,
ACTORCAT_NPC,
@@ -50,11 +43,11 @@ const ActorInit En_Ginko_Man_InitVars = {
};
ActorAnimationEntry animations[] = {
{ &D_060008C0, 1.0f, 0.0f, 0.0f, 0, -4.0f },
{ &D_060043F0, 1.0f, 0.0f, 0.0f, 0, -4.0f },
{ &D_06004F40, 1.0f, 0.0f, 0.0f, 2, -4.0f },
{ &D_06000AC4, 1.0f, 0.0f, 0.0f, 0, -4.0f }, // looking around for customers
{ &D_06004A7C, 1.0f, 0.0f, 0.0f, 0, -4.0f },
{ &object_boj_Anim_0008C0, 1.0f, 0.0f, 0.0f, 0, -4.0f },
{ &object_boj_Anim_0043F0, 1.0f, 0.0f, 0.0f, 0, -4.0f },
{ &object_boj_Anim_004F40, 1.0f, 0.0f, 0.0f, 2, -4.0f },
{ &object_boj_Anim_000AC4, 1.0f, 0.0f, 0.0f, 0, -4.0f }, // looking around for customers
{ &object_boj_Anim_004A7C, 1.0f, 0.0f, 0.0f, 0, -4.0f },
};
void EnGinkoMan_Init(Actor* thisx, GlobalContext* globalCtx) {
@@ -69,7 +62,8 @@ void EnGinkoMan_Init(Actor* thisx, GlobalContext* globalCtx) {
this->isStampChecked = false;
this->choiceDepositWithdrawl = GINKOMAN_CHOICE_RESET;
this->serviceFee = 0;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600C240, &D_060043F0, this->jointTable, this->morphTable, 16);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_boj_Skel_00C240, &object_boj_Anim_0043F0, this->jointTable,
this->morphTable, 16);
EnGinkoMan_SetupIdle(this);
}
@@ -501,7 +495,8 @@ void EnGinkoMan_Dialogue(EnGinkoMan* this, GlobalContext* globalCtx) {
break;
}
if ((this->skelAnime.animation == &D_060008C0) && Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
if ((this->skelAnime.animation == &object_boj_Anim_0008C0) &&
Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BANK_MAN_HAND_HIT);
}
}
@@ -601,12 +596,12 @@ void EnGinkoMan_Stamp(EnGinkoMan* this, GlobalContext* globalCtx) {
void EnGinkoMan_SwitchAnimation(EnGinkoMan* this, GlobalContext* globalCtx) {
if (this->actor.xzDistToPlayer > 160.0f) {
if (this->animTimer == 0) {
if (this->skelAnime.animation != &D_06004A7C) {
if (this->skelAnime.animation != &object_boj_Anim_004A7C) {
this->animTimer = 40;
Actor_ChangeAnimation(&this->skelAnime, animations, GINKO_ADVERTISING);
}
}
} else if ((this->animTimer == 0) && (this->skelAnime.animation != &D_06000AC4)) {
} else if ((this->animTimer == 0) && (this->skelAnime.animation != &object_boj_Anim_000AC4)) {
this->animTimer = 40;
Actor_ChangeAnimation(&this->skelAnime, animations, GINKO_AMAZED);
}
@@ -616,7 +611,7 @@ void EnGinkoMan_SwitchAnimation(EnGinkoMan* this, GlobalContext* globalCtx) {
void EnGinkoMan_FacePlayer(EnGinkoMan* this, GlobalContext* globalCtx) {
SkelAnime_Update(&this->skelAnime);
if (this->skelAnime.animation != &D_06004A7C) {
if (this->skelAnime.animation != &object_boj_Anim_004A7C) {
func_800E9250(globalCtx, &this->actor, &this->limb15Rot, &this->limb8Rot, this->actor.focus.pos);
} else {
func_800E8F08(&this->limb15Rot, &this->limb8Rot);
@@ -637,7 +632,7 @@ s32 EnGinkoMan_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d
EnGinkoMan* this = THIS;
if (limbIndex == 15) {
*dList = D_0600B1D8;
*dList = object_boj_DL_00B1D8;
}
if (limbIndex == 15) {
src/overlays/actors/ovl_En_Gm/z_en_gm.c
+13 -27
View File
@@ -6,6 +6,7 @@
#include "z_en_gm.h"
#include "overlays/actors/ovl_En_Door/z_en_door.h"
#include "objects/object_in2/object_in2.h"
#define FLAGS 0x00000019
@@ -19,25 +20,6 @@ void EnGm_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80950CDC(EnGm* this, GlobalContext* globalCtx);
void func_80950DB8(EnGm* this, GlobalContext* globalCtx);
extern UNK_PTR D_06005028;
extern UNK_PTR D_060054A8;
extern UNK_PTR D_06005CE8;
extern UNK_PTR D_06006828;
extern UNK_PTR D_06006C68;
extern Gfx D_06007528[];
extern FlexSkeletonHeader D_060078B0;
extern AnimationHeader D_06008090;
extern AnimationHeader D_0600898C;
extern AnimationHeader D_06009450;
extern AnimationHeader D_06009CDC;
extern AnimationHeader D_0600A5E0;
extern AnimationHeader D_0600A70C;
extern AnimationHeader D_0600AD18;
extern AnimationHeader D_0600B8B0;
extern AnimationHeader D_0600B990;
extern AnimationHeader D_0600BA80;
extern AnimationHeader D_0600C03C;
static u32 D_80951820[] = {
0x0D000101, 0x360A0061, 0x25020600, 0x09001902, 0x0900090A, 0x0D02090A, 0x090F0105, 0x0E090A09, 0x0F0F0E09,
0x00090A18, 0x0E060009, 0x00060A00, 0x6C490209, 0x0A090F3D, 0x02090F0A, 0x0031020A, 0x000A0525, 0x020C0F0C,
@@ -147,11 +129,13 @@ static ColliderSphereInit sSphereInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
static ActorAnimationEntryS D_80951CC0[13] = {
{ &D_06009CDC, 1.0f, 0, -1, 0, 0 }, { &D_06009CDC, 1.0f, 0, -1, 0, -4 }, { &D_0600A5E0, 1.0f, 0, -1, 0, 0 },
{ &D_0600A70C, 1.0f, 0, 1, 0, 0 }, { &D_06008090, 1.0f, 0, -1, 0, 0 }, { &D_0600898C, 1.0f, 0, -1, 2, -4 },
{ &D_06009450, 1.0f, 0, -1, 2, -4 }, { &D_0600AD18, 1.0f, 0, -1, 0, 0 }, { &D_0600AD18, 1.0f, 0, -1, 0, -4 },
{ &D_0600B8B0, 1.0f, 0, -1, 2, 0 }, { &D_0600BA80, 1.0f, 0, -1, 0, -4 }, { &D_0600C03C, 1.0f, 0, -1, 0, -4 },
{ &D_0600B990, 1.0f, 0, -1, 0, -4 },
{ &object_in2_Anim_009CDC, 1.0f, 0, -1, 0, 0 }, { &object_in2_Anim_009CDC, 1.0f, 0, -1, 0, -4 },
{ &object_in2_Anim_00A5E0, 1.0f, 0, -1, 0, 0 }, { &object_in2_Anim_00A70C, 1.0f, 0, 1, 0, 0 },
{ &object_in2_Anim_008090, 1.0f, 0, -1, 0, 0 }, { &object_in2_Anim_00898C, 1.0f, 0, -1, 2, -4 },
{ &object_in2_Anim_009450, 1.0f, 0, -1, 2, -4 }, { &object_in2_Anim_00AD18, 1.0f, 0, -1, 0, 0 },
{ &object_in2_Anim_00AD18, 1.0f, 0, -1, 0, -4 }, { &object_in2_Anim_00B8B0, 1.0f, 0, -1, 2, 0 },
{ &object_in2_Anim_00BA80, 1.0f, 0, -1, 0, -4 }, { &object_in2_Anim_00C03C, 1.0f, 0, -1, 0, -4 },
{ &object_in2_Anim_00B990, 1.0f, 0, -1, 0, -4 },
};
Actor* func_8094DEE0(EnGm* this, GlobalContext* globalCtx, u8 arg2, s16 arg3) {
@@ -1598,7 +1582,8 @@ void EnGm_Init(Actor* thisx, GlobalContext* globalCtx) {
}
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 22.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060078B0, NULL, this->jointTable, this->morphTable, 20);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_in2_Skel_0078B0, NULL, this->jointTable, this->morphTable,
20);
this->unk_3E8 = -1;
func_8094E054(this, globalCtx, 0);
Collider_InitAndSetCylinder(globalCtx, &this->colliderCylinder, &this->actor, &sCylinderInit);
@@ -1699,7 +1684,7 @@ void EnGm_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
OPEN_DISPS(globalCtx->state.gfxCtx);
if ((limbIndex == 15) && (this->unk_3A4 & 0x800)) {
gSPDisplayList(POLY_OPA_DISP++, D_06007528);
gSPDisplayList(POLY_OPA_DISP++, object_in2_DL_007528);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
@@ -1752,7 +1737,8 @@ void EnGm_TransformLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* this
}
void EnGm_Draw(Actor* thisx, GlobalContext* globalCtx) {
static UNK_PTR D_80951E30[] = { &D_060054A8, &D_06005028, &D_06006828, &D_06005028, &D_06005CE8, &D_06006C68 };
static TexturePtr D_80951E30[] = { object_in2_Tex_0054A8, object_in2_Tex_005028, object_in2_Tex_006828,
object_in2_Tex_005028, object_in2_Tex_005CE8, object_in2_Tex_006C68 };
EnGm* this = THIS;
if ((this->unk_258 != 0) && (this->unk_262 >= 0)) {
src/overlays/actors/ovl_En_Go/z_en_go.c
+3 -4
View File
@@ -290,8 +290,7 @@ void func_80A1143C(EnGoStruct ptr[], Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 arg
void func_80A115B4(EnGoStruct ptr[], GlobalContext* globalCtx) {
static TexturePtr D_80A16644[] = {
&gameplay_keep_Tex_08F7E0, &gameplay_keep_Tex_08F3E0, &gameplay_keep_Tex_08EFE0, &gameplay_keep_Tex_08EBE0,
&gameplay_keep_Tex_08E7E0, &gameplay_keep_Tex_08E3E0, &gameplay_keep_Tex_08DFE0, &gameplay_keep_Tex_08DBE0,
&gDust8Tex, &gDust7Tex, &gDust6Tex, &gDust5Tex, &gDust4Tex, &gDust3Tex, &gDust2Tex, &gDust1Tex,
};
static Color_RGBA8 D_80A16664[] = {
{ 255, 255, 255, 0 },
@@ -2045,8 +2044,8 @@ void EnGo_TransfromLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* this
void func_80A15FEC(Actor* thisx, GlobalContext* globalCtx) {
static TexturePtr D_80A1670C[] = {
&object_oF1d_map_Tex_010438, &object_oF1d_map_Tex_010C38, &object_oF1d_map_Tex_011038,
&object_oF1d_map_Tex_010C38, &object_oF1d_map_Tex_010838,
object_oF1d_map_Tex_010438, object_oF1d_map_Tex_010C38, object_oF1d_map_Tex_011038,
object_oF1d_map_Tex_010C38, object_oF1d_map_Tex_010838,
};
EnGo* this = THIS;
src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
+11 -24
View File
@@ -5,6 +5,8 @@
*/
#include "z_en_goroiwa.h"
#include "objects/object_goroiwa/object_goroiwa.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x80000010
@@ -30,21 +32,6 @@ void func_80941FA4(EnGoroiwa* this, GlobalContext* globalCtx);
void func_80942084(EnGoroiwa* this);
void func_809420F0(EnGoroiwa* this, GlobalContext* globalCtx);
extern Gfx D_060032E0[];
extern Gfx D_060082D0[];
extern Gfx D_06005C20[];
extern Gfx D_06003B40[];
extern Gfx D_06008B90[];
extern Gfx D_060042B0[];
extern Gfx D_06004960[];
extern Gfx D_06004EF0[];
extern Gfx D_060003B0[];
extern Gfx D_060028E0[];
extern Gfx D_06002D70[];
extern Gfx D_060072F0[];
extern Gfx D_060077D0[];
extern Gfx D_06007C60[];
const ActorInit En_Goroiwa_InitVars = {
ACTOR_EN_GOROIWA,
ACTORCAT_PROP,
@@ -94,9 +81,9 @@ static f32 D_80942DFC[] = {
};
static Gfx* D_80942E0C[][3] = {
{ D_060042B0, D_06004960, D_06004EF0 },
{ D_060003B0, D_060028E0, D_06002D70 },
{ D_060072F0, D_060077D0, D_06007C60 },
{ object_goroiwa_DL_0042B0, object_goroiwa_DL_004960, object_goroiwa_DL_004EF0 },
{ object_goroiwa_DL_0003B0, object_goroiwa_DL_0028E0, object_goroiwa_DL_002D70 },
{ object_goroiwa_DL_0072F0, object_goroiwa_DL_0077D0, object_goroiwa_DL_007C60 },
};
static Color_RGBA8 D_80942E30[] = {
@@ -1577,9 +1564,9 @@ void func_80942B1C(EnGoroiwa* this, GlobalContext* globalCtx) {
Vec3s sp80;
if (params == ENGOROIWA_C000_1) {
phi_fp = D_060032E0;
phi_fp = object_goroiwa_DL_0032E0;
} else {
phi_fp = D_060082D0;
phi_fp = object_goroiwa_DL_0082D0;
}
for (i = 0; i < ARRAY_COUNT(this->unk_1E8); i++) {
@@ -1609,7 +1596,7 @@ void func_80942B1C(EnGoroiwa* this, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_04076BC0);
gSPDisplayList(POLY_XLU_DISP++, gCircleShadowDL);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -1619,9 +1606,9 @@ void func_80942B1C(EnGoroiwa* this, GlobalContext* globalCtx) {
void EnGoroiwa_Draw(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* D_80942EB4[] = {
D_06005C20,
D_06003B40,
D_06008B90,
object_goroiwa_DL_005C20,
object_goroiwa_DL_003B40,
object_goroiwa_DL_008B90,
};
EnGoroiwa* this = THIS;
s32 params = ENGOROIWA_GET_C000(&this->actor);
src/overlays/actors/ovl_En_Gs/z_en_gs.c
+4 -7
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_gs.h"
#include "objects/object_gs/object_gs.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x02000019
@@ -36,10 +37,6 @@ s32 func_809995A4(EnGs* this, GlobalContext* globalCtx);
void func_80999A8C(EnGs* this, GlobalContext* globalCtx);
void func_80999AC0(EnGs* this);
extern Gfx D_06000950[];
extern Gfx D_060009D0[];
extern Gfx D_06000A60[];
const ActorInit En_Gs_InitVars = {
ACTOR_EN_GS,
ACTORCAT_PROP,
@@ -1085,10 +1082,10 @@ void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06000950);
gSPDisplayList(POLY_OPA_DISP++, object_gs_DL_000950);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->unk_1FA.r, this->unk_1FA.g, this->unk_1FA.b, 255);
gSPDisplayList(POLY_OPA_DISP++, D_060009D0);
gSPDisplayList(POLY_OPA_DISP++, D_06000A60);
gSPDisplayList(POLY_OPA_DISP++, object_gs_DL_0009D0);
gSPDisplayList(POLY_OPA_DISP++, object_gs_DL_000A60);
Matrix_StatePop();
src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c
+6 -12
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_guruguru.h"
#include "objects/object_fu/object_fu.h"
#define FLAGS 0x00000019
@@ -24,15 +25,7 @@ void func_80BC73F4(EnGuruguru* this);
void func_80BC7440(EnGuruguru* this, GlobalContext* globalCtx);
void func_80BC7520(EnGuruguru* this, GlobalContext* globalCtx);
extern FlexSkeletonHeader D_06006C90;
extern ColliderCylinderInit D_80BC79A0;
extern AnimationHeader D_06000B04;
extern AnimationHeader D_0600057C;
extern u64 D_06005F20[];
extern u64 D_06006320[];
extern u64 D_06006720[];
extern u64 D_06006920[];
const ActorInit En_Guruguru_InitVars = {
ACTOR_EN_GURUGURU,
@@ -69,18 +62,19 @@ static ColliderCylinderInit sCylinderInit = {
{ 15, 20, 0, { 0, 0, 0 } },
};
static AnimationHeader* D_80BC79CC[] = { &D_06000B04, &D_0600057C };
static AnimationHeader* D_80BC79CC[] = { &object_fu_Anim_000B04, &object_fu_Anim_00057C };
static u8 D_80BC79D4[] = { 0 };
static f32 D_80BC79D8[] = { 1.0f, 1.0f };
static void* sEyeTextures[] = { D_06005F20, D_06006320 };
static void* sMouthTextures[] = { D_06006720, D_06006920 };
static TexturePtr sEyeTextures[] = { object_fu_Tex_005F20, object_fu_Tex_006320 };
static TexturePtr sMouthTextures[] = { object_fu_Tex_006720, object_fu_Tex_006920 };
void EnGuruguru_Init(Actor* thisx, GlobalContext* globalCtx) {
EnGuruguru* this = THIS;
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 19.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06006C90, &D_06000B04, this->jointTable, this->morphTable, 16);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_fu_Skel_006C90, &object_fu_Anim_000B04, this->jointTable,
this->morphTable, 16);
this->actor.targetMode = 0;
if (this->actor.params != 2) {
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c
+5 -6
View File
@@ -6,6 +6,8 @@
#include "z_en_hakurock.h"
#include "overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_boss_hakugin/object_boss_hakugin.h"
#define FLAGS 0x00000030
@@ -64,10 +66,7 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit sColChkInfoInit = { 0, 60, 60, MASS_IMMOVABLE };
extern Gfx D_06011100[];
// Stalactite
extern Gfx D_06011178[];
void EnHakurock_Init(Actor* thisx, GlobalContext* globalCtx) {
EnHakurock* this = THIS;
@@ -344,7 +343,7 @@ void func_80B228F4(Actor* thisx, GlobalContext* globalCtx) {
func_8012C28C(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0x80, 255, 185, 24, 255);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, &D_0406AB30);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_06AB30);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -353,7 +352,7 @@ void EnHakurock_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_8012C28C(globalCtx->state.gfxCtx);
Matrix_InsertTranslation(-100.0f, 0.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06011100);
gSPDisplayList(POLY_OPA_DISP++, D_06011178);
gSPDisplayList(POLY_OPA_DISP++, object_boss_hakugin_DL_011100);
gSPDisplayList(POLY_OPA_DISP++, object_boss_hakugin_DL_011178);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
src/overlays/actors/ovl_En_Hg/z_en_hg.c
+12 -18
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_hg.h"
#include "objects/object_harfgibud/object_harfgibud.h"
#define FLAGS 0x02100019
@@ -30,17 +31,6 @@ void func_80BCF95C(EnHg* this, GlobalContext* globalCtx);
s32 EnHg_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx);
void EnHg_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx);
extern AnimationHeader D_06000370;
extern AnimationHeader D_06001138;
extern AnimationHeader D_060015D4;
extern AnimationHeader D_06001960;
extern AnimationHeader D_0600260C;
extern Gfx D_06005E28[];
extern FlexSkeletonHeader D_06008580;
extern AnimationHeader D_06009D44;
extern AnimationHeader D_0600A164;
extern AnimationHeader D_0600AE1C;
const ActorInit En_Hg_InitVars = {
ACTOR_EN_HG,
ACTORCAT_PROP,
@@ -113,10 +103,14 @@ static CollisionCheckInfoInit2 sColChkInfoInit2 = {
};
static ActorAnimationEntry sAnimations[] = {
{ &D_0600260C, 1.0f, 0.0f, 0.0f, 0, -4.0f }, { &D_06009D44, 1.0f, 0.0f, 0.0f, 0, -4.0f },
{ &D_0600A164, 1.0f, 0.0f, 0.0f, 0, -4.0f }, { &D_06000370, 1.0f, 0.0f, 0.0f, 2, 0.0f },
{ &D_06001138, 1.0f, 0.0f, 0.0f, 0, 0.0f }, { &D_060015D4, 1.0f, 0.0f, 0.0f, 2, 0.0f },
{ &D_06001960, 1.0f, 0.0f, 0.0f, 0, 0.0f }, { &D_0600AE1C, 1.0f, 0.0f, 0.0f, 0, 0.0f },
{ &object_harfgibud_Anim_00260C, 1.0f, 0.0f, 0.0f, 0, -4.0f },
{ &object_harfgibud_Anim_009D44, 1.0f, 0.0f, 0.0f, 0, -4.0f },
{ &object_harfgibud_Anim_00A164, 1.0f, 0.0f, 0.0f, 0, -4.0f },
{ &object_harfgibud_Anim_000370, 1.0f, 0.0f, 0.0f, 2, 0.0f },
{ &object_harfgibud_Anim_001138, 1.0f, 0.0f, 0.0f, 0, 0.0f },
{ &object_harfgibud_Anim_0015D4, 1.0f, 0.0f, 0.0f, 2, 0.0f },
{ &object_harfgibud_Anim_001960, 1.0f, 0.0f, 0.0f, 0, 0.0f },
{ &object_harfgibud_Anim_00AE1C, 1.0f, 0.0f, 0.0f, 0, 0.0f },
};
static u32 D_80BD00C8 = false;
@@ -127,8 +121,8 @@ void EnHg_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 i;
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 36.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06008580, &D_0600260C, this->jointTable, this->morphTable,
HG_LIMB_MAX);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_harfgibud_Skel_008580, &object_harfgibud_Anim_00260C,
this->jointTable, this->morphTable, HG_LIMB_MAX);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit2);
@@ -422,6 +416,6 @@ void EnHg_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnHg_OverrideLimbDraw, EnHg_PostLimbDraw, &this->actor);
Matrix_SetCurrentState(&this->unk1D8);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06005E28);
gSPDisplayList(POLY_OPA_DISP++, object_harfgibud_DL_005E28);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
src/overlays/actors/ovl_En_Ig/z_en_ig.c
+2 -2
View File
@@ -992,8 +992,8 @@ void EnIg_TransformLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* this
void EnIg_Draw(Actor* thisx, GlobalContext* globalCtx) {
static TexturePtr D_80BF3534[] = {
&object_dai_Tex_0107B0, &object_dai_Tex_010FB0, &object_dai_Tex_0117B0,
&object_dai_Tex_011FB0, &object_dai_Tex_0127B0,
object_dai_Tex_0107B0, object_dai_Tex_010FB0, object_dai_Tex_0117B0,
object_dai_Tex_011FB0, object_dai_Tex_0127B0,
};
s32 pad;
EnIg* this = THIS;
src/overlays/actors/ovl_En_In/z_en_in.c
+48 -70
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_in.h"
#include "objects/object_in/object_in.h"
#define FLAGS 0x00000019
@@ -46,54 +47,6 @@ const ActorInit En_In_InitVars = {
(ActorFunc)EnIn_Draw,
};
extern FlexSkeletonHeader D_06014EA8;
extern AnimationHeader D_06015E38;
extern AnimationHeader D_06016484;
extern AnimationHeader D_06016A60;
extern AnimationHeader D_060170DC;
extern AnimationHeader D_060177AC;
extern AnimationHeader D_06018240;
extern AnimationHeader D_060187C8;
extern AnimationHeader D_060198A8;
extern Gfx D_06007A70[];
extern Gfx D_06007C48[];
extern Gfx D_0601C528[];
extern AnimatedMaterial D_06001C30;
extern UNK_TYPE D_06003520;
extern UNK_TYPE D_060035E0;
extern UNK_TYPE D_06004820;
extern UNK_TYPE D_06004C20;
extern UNK_TYPE D_060043E0;
extern AnimationHeader D_06001D10;
extern AnimationHeader D_06014F8C;
extern AnimationHeader D_06000CB0;
extern AnimationHeader D_060003B4;
extern AnimationHeader D_06001BE0;
extern AnimationHeader D_06015918;
extern AnimationHeader D_0601C0B0;
extern AnimationHeader D_0601A140;
extern AnimationHeader D_0601B904;
extern AnimationHeader D_0601B3C4;
extern AnimationHeader D_06019EB4;
extern Gfx D_060137A0[];
extern Gfx D_06014420[];
extern Gfx D_06014040[];
extern Gfx D_06013670[];
extern Gfx D_06014AE0[];
extern Gfx D_06012A78[];
extern Gfx D_06013DE0[];
extern Gfx D_060138D0[];
extern Gfx D_06013540[];
extern Gfx D_06012DF8[];
extern Gfx D_060145D8[];
extern Gfx D_06014860[];
extern Gfx D_06014710[];
extern Gfx D_06013A00[];
extern Gfx D_06013F10[];
extern Gfx D_06014C30[];
extern Gfx D_060149A8[];
extern Gfx D_06013440[];
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_HIT0,
@@ -179,12 +132,15 @@ static DamageTable sDamageTable = {
};
static ActorAnimationEntryS sAnimations[] = {
{ &D_06001D10, 1.0f, 0, -1, 0, 0 }, { &D_06001D10, 1.0f, 0, -1, 0, -4 }, { &D_06014F8C, 1.0f, 0, -1, 0, 0 },
{ &D_06014F8C, 1.0f, 0, -1, 0, -4 }, { &D_06000CB0, 1.0f, 0, -1, 0, -4 }, { &D_060003B4, 1.0f, 0, -1, 0, -4 },
{ &D_06001BE0, 1.0f, 0, -1, 0, -4 }, { &D_06015918, 1.0f, 0, -1, 0, -4 }, { &D_0601C0B0, 1.0f, 0, -1, 0, 0 },
{ &D_0601C0B0, 1.0f, 0, -1, 0, -4 }, { &D_0601A140, 1.0f, 0, -1, 0, 0 }, { &D_0601A140, 1.0f, 0, -1, 0, -4 },
{ &D_0601B904, 1.0f, 0, -1, 0, 0 }, { &D_0601B904, 1.0f, 0, -1, 0, -4 }, { &D_0601B3C4, 1.0f, 0, -1, 0, 0 },
{ &D_0601B3C4, 0.0f, 0, -1, 2, 0 }, { &D_0601B3C4, 1.0f, 0, -1, 0, -4 }, { &D_06019EB4, 1.0f, 0, -1, 2, -4 },
{ &object_in_Anim_001D10, 1.0f, 0, -1, 0, 0 }, { &object_in_Anim_001D10, 1.0f, 0, -1, 0, -4 },
{ &object_in_Anim_014F8C, 1.0f, 0, -1, 0, 0 }, { &object_in_Anim_014F8C, 1.0f, 0, -1, 0, -4 },
{ &object_in_Anim_000CB0, 1.0f, 0, -1, 0, -4 }, { &object_in_Anim_0003B4, 1.0f, 0, -1, 0, -4 },
{ &object_in_Anim_001BE0, 1.0f, 0, -1, 0, -4 }, { &object_in_Anim_015918, 1.0f, 0, -1, 0, -4 },
{ &object_in_Anim_01C0B0, 1.0f, 0, -1, 0, 0 }, { &object_in_Anim_01C0B0, 1.0f, 0, -1, 0, -4 },
{ &object_in_Anim_01A140, 1.0f, 0, -1, 0, 0 }, { &object_in_Anim_01A140, 1.0f, 0, -1, 0, -4 },
{ &object_in_Anim_01B904, 1.0f, 0, -1, 0, 0 }, { &object_in_Anim_01B904, 1.0f, 0, -1, 0, -4 },
{ &object_in_Anim_01B3C4, 1.0f, 0, -1, 0, 0 }, { &object_in_Anim_01B3C4, 0.0f, 0, -1, 2, 0 },
{ &object_in_Anim_01B3C4, 1.0f, 0, -1, 0, -4 }, { &object_in_Anim_019EB4, 1.0f, 0, -1, 2, -4 },
};
static u16 D_808F6C0C[] = {
@@ -344,10 +300,11 @@ void func_808F3690(EnIn* this, GlobalContext* globalCtx) {
}
void func_808F374C(EnIn* this, GlobalContext* globalCtx) {
AnimationHeader* animations[] = { &D_06015E38, &D_06016A60, &D_060177AC, &D_06016484,
&D_060170DC, &D_06018240, &D_060187C8, &D_060198A8 };
AnimationHeader* animations[] = { &object_in_Anim_015E38, &object_in_Anim_016A60, &object_in_Anim_0177AC,
&object_in_Anim_016484, &object_in_Anim_0170DC, &object_in_Anim_018240,
&object_in_Anim_0187C8, &object_in_Anim_0198A8 };
if (this->skelAnime.animation == &D_06016484 || this->skelAnime.animation == &D_060170DC) {
if (this->skelAnime.animation == &object_in_Anim_016484 || this->skelAnime.animation == &object_in_Anim_0170DC) {
if (Animation_OnFrame(&this->skelAnime, 8.0f)) {
func_8019F88C(&this->actor.projectedPos, NA_SE_VO_IN_LASH_0, 2);
if (Rand_ZeroOne() < 0.3f) {
@@ -356,7 +313,7 @@ void func_808F374C(EnIn* this, GlobalContext* globalCtx) {
Audio_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_IT_LASH);
}
}
if (this->skelAnime.animation == &D_060198A8 && Animation_OnFrame(&this->skelAnime, 20.0f)) {
if (this->skelAnime.animation == &object_in_Anim_0198A8 && Animation_OnFrame(&this->skelAnime, 20.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_IN_CRY_0);
}
if (SkelAnime_Update(&this->skelAnime)) {
@@ -1402,7 +1359,8 @@ void EnIn_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06014EA8, NULL, this->jointTable, this->morphTable, 20);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_in_Skel_014EA8, NULL, this->jointTable, this->morphTable,
20);
func_808F30B0(&this->skelAnime, 0);
Collider_InitCylinder(globalCtx, &this->colliderCylinder);
Collider_SetCylinder(globalCtx, &this->colliderCylinder, &this->actor, &sCylinderInit);
@@ -1418,7 +1376,8 @@ void EnIn_Init(Actor* thisx, GlobalContext* globalCtx) {
if (type == ENIN_HORSE_RIDER_YELLOW_SHIRT || type == ENIN_HORSE_RIDER_BLUE_SHIRT) {
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
this->unk488 = 1;
Animation_Change(&this->skelAnime, &D_06016A60, 1.0f, 0.0f, Animation_GetLastFrame(&D_06016A60), 2, 0.0f);
Animation_Change(&this->skelAnime, &object_in_Anim_016A60, 1.0f, 0.0f,
Animation_GetLastFrame(&object_in_Anim_016A60), 2, 0.0f);
Actor_SetScale(&this->actor, 0.01f);
this->unk23C = 0;
this->unk23D = 1;
@@ -1541,9 +1500,26 @@ s32 EnIn_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
EnIn* this = THIS;
s32 pad;
Gfx* sp50[] = {
NULL, NULL, D_060149A8, D_06014AE0, D_06014C30, D_060145D8, D_06014710,
D_06014860, D_06014420, D_06012A78, D_06013DE0, D_06013F10, D_06014040, D_060137A0,
D_060138D0, D_06013A00, D_06012DF8, D_06013670, D_06013540, D_06013440,
NULL,
NULL,
object_in_DL_0149A8,
object_in_DL_014AE0,
object_in_DL_014C30,
object_in_DL_0145D8,
object_in_DL_014710,
object_in_DL_014860,
object_in_DL_014420,
object_in_DL_012A78,
object_in_DL_013DE0,
object_in_DL_013F10,
object_in_DL_014040,
object_in_DL_0137A0,
object_in_DL_0138D0,
object_in_DL_013A00,
object_in_DL_012DF8,
object_in_DL_013670,
object_in_DL_013540,
object_in_DL_013440,
};
if (this->unk23C != 0 && limbIndex != 16) {
@@ -1552,16 +1528,18 @@ s32 EnIn_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
}
}
if (this->unk4AC & 4 && limbIndex == 16) {
*dList = D_0601C528;
*dList = object_in_DL_01C528;
}
OPEN_DISPS(globalCtx->state.gfxCtx);
if (limbIndex == 16) {
void* sp38[] = { &D_060035E0, &D_06004820, &D_06004C20, &D_060043E0 };
TexturePtr sp38[] = { object_in_Tex_0035E0, object_in_Tex_004820, object_in_Tex_004C20, object_in_Tex_0043E0 };
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(sp38[this->unk482]));
gSPSegment(POLY_OPA_DISP++, 0x09, Lib_SegmentedToVirtual(&D_06003520));
gSPSegment(POLY_OPA_DISP++, 0x09, Lib_SegmentedToVirtual(object_in_Tex_003520));
} else {
AnimatedMat_DrawStep(globalCtx, Lib_SegmentedToVirtual(&D_06001C30), this->unk4AC & 8 ? 1 : 0);
AnimatedMat_DrawStep(globalCtx, Lib_SegmentedToVirtual(object_in_Matanimheader_001C30),
this->unk4AC & 8 ? 1 : 0);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
@@ -1619,10 +1597,10 @@ void EnIn_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
if (!(this->unk4AC & 8)) {
OPEN_DISPS(globalCtx->state.gfxCtx);
if (limbIndex == 12) {
gSPDisplayList(POLY_OPA_DISP++, D_06007A70);
gSPDisplayList(POLY_OPA_DISP++, object_in_DL_007A70);
}
if (limbIndex == 15) {
gSPDisplayList(POLY_OPA_DISP++, D_06007C48);
gSPDisplayList(POLY_OPA_DISP++, object_in_DL_007C48);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -1631,7 +1609,7 @@ void EnIn_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
if (this->unk4AC & 0x20) {
OPEN_DISPS(globalCtx->state.gfxCtx);
if (limbIndex == 12) {
gSPDisplayList(POLY_OPA_DISP++, D_06007C48);
gSPDisplayList(POLY_OPA_DISP++, object_in_DL_007C48);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c
+89 -133
View File
@@ -3,9 +3,14 @@
* Overlay: ovl_En_Invadepoh
* Description: Ranch nighttime actors
*/
#include "prevent_bss_reordering.h"
#include "z_en_invadepoh.h"
#include "overlays/actors/ovl_En_Door/z_en_door.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_ma1/object_ma1.h"
#include "objects/object_ma2/object_ma2.h"
#include "objects/object_dog/object_dog.h"
#include "objects/object_cow/object_cow.h"
#include "objects/object_uch/object_uch.h"
#define FLAGS 0x00000010
@@ -170,56 +175,6 @@ void func_80B45A4C(EnInvadePohStruct* s, unkstructInvadepoh4** u);
void func_80B45A94(EnInvadePohStruct* s, unkstructInvadepoh4** u);
void func_80B45B1C(EnInvadePohStruct* s, unkstructInvadepoh4** u);
extern AnimatedMaterial D_06000550;
extern AnimatedMaterial D_06000560;
extern AnimationHeader D_06000608;
extern AnimationHeader D_060006C8;
extern AnimationHeader D_06000998;
extern AnimationHeader D_06001560;
extern AnimationHeader D_06001674;
extern AnimationHeader D_06001BD8;
extern AnimationHeader D_06001D80;
extern AnimationHeader D_060021C8;
extern AnimationHeader D_06002A8C;
extern AnimationHeader D_06004264;
extern AnimationHeader D_06004E98;
extern AnimationHeader D_06007328;
extern AnimationHeader D_06009E58;
extern AnimationHeader D_0600A174;
extern AnimationHeader D_06014088;
extern AnimationHeader D_06016720;
extern FlexSkeletonHeader D_060080F0;
extern FlexSkeletonHeader D_06004010;
extern FlexSkeletonHeader D_06004C30;
extern FlexSkeletonHeader D_06004E50;
extern FlexSkeletonHeader D_06013928;
extern FlexSkeletonHeader D_06015C28;
extern Gfx D_0600FFC8[];
extern Gfx D_060107C8[];
extern Gfx D_06010FC8[];
extern Gfx D_060117C8[];
extern Gfx D_06011FC8[];
extern Gfx D_060127C8[];
extern Gfx D_06012BC8[];
extern Gfx D_06012FC8[];
extern Gfx D_060133C8[];
extern Gfx D_06011AD8[];
extern Gfx D_060122D8[];
extern Gfx D_06012AD8[];
extern Gfx D_060132D8[];
extern Gfx D_06013AD8[];
extern Gfx D_060142D8[];
extern Gfx D_06014AD8[];
extern Gfx D_06014ED8[];
extern Gfx D_060152D8[];
extern Gfx D_060156D8[];
extern Gfx D_060003B0[];
extern Gfx D_06000720[];
extern Gfx D_06000080[];
extern s32 D_801BDA9C;
const ActorInit En_Invadepoh_InitVars = {
@@ -298,28 +253,29 @@ static Vec3f D_80B4E934 = { 216.0f, -20.0f, 1395.0f };
static s32 D_80B4E940 = 0;
static Gfx* D_80B4E944[] = {
D_0600FFC8, D_060107C8, D_06010FC8, D_060117C8, D_06011FC8,
static TexturePtr D_80B4E944[] = {
object_ma1_Tex_00FFC8, object_ma1_Tex_0107C8, object_ma1_Tex_010FC8, object_ma1_Tex_0117C8, object_ma1_Tex_011FC8,
};
static Gfx* D_80B4E958[] = {
D_060127C8,
D_06012BC8,
D_06012FC8,
D_060133C8,
static TexturePtr D_80B4E958[] = {
object_ma1_Tex_0127C8,
object_ma1_Tex_012BC8,
object_ma1_Tex_012FC8,
object_ma1_Tex_0133C8,
};
static s8 D_80B4E968 = 0;
static Gfx* D_80B4E96C[] = {
D_06011AD8, D_060122D8, D_06012AD8, D_060132D8, D_06013AD8, D_060142D8,
static TexturePtr D_80B4E96C[] = {
object_ma2_Tex_011AD8, object_ma2_Tex_0122D8, object_ma2_Tex_012AD8,
object_ma2_Tex_0132D8, object_ma2_Tex_013AD8, object_ma2_Tex_0142D8,
};
static Gfx* D_80B4E984[] = {
D_06014AD8,
D_06014ED8,
D_060152D8,
D_060156D8,
static TexturePtr D_80B4E984[] = {
object_ma2_Tex_014AD8,
object_ma2_Tex_014ED8,
object_ma2_Tex_0152D8,
object_ma2_Tex_0156D8,
};
static s8 D_80B4E994 = 0;
@@ -1237,7 +1193,7 @@ void func_80B44EFC(EnInvadepoh* this, GlobalContext* globalCtx) {
void func_80B44F58(void) {
s32 i;
Gfx** iter;
TexturePtr* iter;
if (!D_80B4E968) {
D_80B4E968 = true;
@@ -1253,7 +1209,7 @@ void func_80B44F58(void) {
void func_80B44FEC(void) {
s32 i;
Gfx** iter;
TexturePtr* iter;
if (!D_80B4E994) {
D_80B4E994 = true;
@@ -1268,8 +1224,8 @@ void func_80B44FEC(void) {
}
void func_80B45080(void) {
D_80B50400 = Lib_SegmentedToVirtual(&D_06000560);
D_80B503FC = Lib_SegmentedToVirtual(&D_06000550);
D_80B50400 = Lib_SegmentedToVirtual(object_uch_Matanimheader_000560);
D_80B503FC = Lib_SegmentedToVirtual(object_uch_Matanimheader_000550);
}
s32 func_80B450C0(f32* x1, f32* z1, f32 x2, f32 z2, f32 speed) {
@@ -2159,7 +2115,7 @@ void func_80B474DC(EnInvadepoh* this, GlobalContext* globalCtx) {
}
void func_80B47568(EnInvadepoh* this) {
Animation_MorphToLoop(&this->skelAnime, &D_06001D80, -6.0f);
Animation_MorphToLoop(&this->skelAnime, &object_uch_Anim_001D80, -6.0f);
this->collider.base.atFlags &= ~0x1;
this->collider.base.acFlags &= ~0x1;
this->collider.base.ocFlags1 &= ~0x1;
@@ -2201,8 +2157,8 @@ void func_80B47600(EnInvadepoh* this, GlobalContext* globalCtx) {
}
void func_80B4770C(EnInvadepoh* this) {
if (this->skelAnime.animation != &D_06001D80) {
Animation_MorphToLoop(&this->skelAnime, &D_06001D80, -6.0f);
if (this->skelAnime.animation != &object_uch_Anim_001D80) {
Animation_MorphToLoop(&this->skelAnime, &object_uch_Anim_001D80, -6.0f);
}
this->collider.base.atFlags |= 1;
this->collider.base.acFlags |= 1;
@@ -2230,7 +2186,7 @@ void func_80B47830(EnInvadepoh* this) {
this->collider.base.atFlags &= ~1;
this->collider.base.acFlags &= ~1;
this->collider.base.ocFlags1 |= 1;
Animation_PlayLoop(&this->skelAnime, &D_060006C8);
Animation_PlayLoop(&this->skelAnime, &object_uch_Anim_0006C8);
Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 16);
this->alienAlpha = 255;
this->actor.draw = func_80B4DB14;
@@ -2255,7 +2211,7 @@ void func_80B47938(EnInvadepoh* this) {
this->collider.base.atFlags &= ~1;
this->collider.base.acFlags &= ~1;
this->collider.base.ocFlags1 &= ~1;
Animation_PlayLoop(&this->skelAnime, &D_06000608);
Animation_PlayLoop(&this->skelAnime, &object_uch_Anim_000608);
this->actor.flags &= ~1;
this->actionTimer = 10;
this->alienAlpha = 255;
@@ -2326,8 +2282,8 @@ void func_80B47BAC(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetObjectDependency(globalCtx, &this->actor);
func_80B45080();
this->actor.update = func_80B47D30;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004E50, &D_06001D80, this->jointTable, this->morphTable,
14);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_uch_Skel_004E50, &object_uch_Anim_001D80,
this->jointTable, this->morphTable, 14);
this->skelAnime.curFrame = (this->actor.params & 7) * this->skelAnime.endFrame * 0.125f;
func_80B444BC(this, globalCtx);
func_80B442E4(this);
@@ -2409,8 +2365,8 @@ void func_80B47FA8(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetObjectDependency(globalCtx, thisx);
this->actor.update = func_80B48060;
this->actor.draw = func_80B4E158;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004010, NULL, this->jointTable, this->morphTable, 6);
Animation_PlayLoop(&this->skelAnime, &D_06004264);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCowBodySkel, NULL, this->jointTable, this->morphTable, 6);
Animation_PlayLoop(&this->skelAnime, &gCowBodyMoveHeadAnim);
}
}
@@ -2452,8 +2408,8 @@ void func_80B481C4(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetObjectDependency(globalCtx, &this->actor);
this->actor.update = func_80B4827C;
this->actor.draw = func_80B4E1B0;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004C30, NULL, this->jointTable, this->morphTable, 6);
Animation_PlayLoop(&this->skelAnime, &D_06004E98);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCowTailSkel, NULL, this->jointTable, this->morphTable, 6);
Animation_PlayLoop(&this->skelAnime, &gCowTailSwishAnim);
}
}
@@ -2470,7 +2426,7 @@ void func_80B4827C(Actor* thisx, GlobalContext* globalCtx) {
void func_80B482D4(EnInvadepoh* this) {
this->actionTimer = 40;
Animation_MorphToLoop(&this->skelAnime, &D_06002A8C, -10.0f);
Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_002A8C, -10.0f);
this->actor.draw = NULL;
this->actionFunc = func_80B48324;
}
@@ -2486,7 +2442,7 @@ void func_80B48324(EnInvadepoh* this, GlobalContext* globalCtx) {
void func_80B48374(EnInvadepoh* this) {
this->actionTimer = 60;
Animation_MorphToLoop(&this->skelAnime, &D_06002A8C, -10.0f);
Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_002A8C, -10.0f);
this->actor.draw = func_80B4E324;
this->actionFunc = func_80B483CC;
}
@@ -2518,7 +2474,7 @@ void func_80B4843C(EnInvadepoh* this) {
this->behaviorInfo.unk44 = 0.1f;
this->behaviorInfo.unk48 = 2000;
this->actionTimer = 50;
Animation_Change(&this->skelAnime, &D_06007328, 2.0f, 0.0f, 0.0f, 0, -5.0f);
Animation_Change(&this->skelAnime, &object_ma1_Anim_007328, 2.0f, 0.0f, 0.0f, 0, -5.0f);
this->actor.draw = func_80B4E324;
this->actionFunc = func_80B484EC;
}
@@ -2548,7 +2504,7 @@ void func_80B48588(EnInvadepoh* this) {
this->behaviorInfo.unk42 = 0;
this->behaviorInfo.unk44 = 0.28f;
this->behaviorInfo.unk48 = 7000;
Animation_MorphToPlayOnce(&this->skelAnime, &D_06009E58, -10.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_ma1_Anim_009E58, -10.0f);
this->actor.draw = func_80B4E324;
this->actionFunc = func_80B48610;
}
@@ -2565,10 +2521,10 @@ void func_80B48620(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetObjectDependency(globalCtx, &this->actor);
func_80B44F58();
this->actor.update = func_80B4873C;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013928, &D_06009E58, this->jointTable, this->morphTable,
23);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma1_Skel_013928, &object_ma1_Anim_009E58,
this->jointTable, this->morphTable, 23);
func_80B45C04(&this->behaviorInfo, D_80B4EA90, 6, D_80B4EB00, 2, &gZeroVec3s, 5000, 0.05f, 0.3f, 0.12f);
Animation_PlayLoop(&this->skelAnime, &D_06009E58);
Animation_PlayLoop(&this->skelAnime, &object_ma1_Anim_009E58);
func_80B482D4(this);
}
}
@@ -2601,7 +2557,7 @@ void func_80B487B4(EnInvadepoh* this) {
substruct->unk26.z = 0;
substruct->unk30 = 0.1f;
substruct->unk2C = 800;
Animation_MorphToLoop(&this->skelAnime, &D_06014088, -10.0f);
Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_014088, -10.0f);
this->actionFunc = func_80B48848;
}
@@ -2661,7 +2617,7 @@ void func_80B48948(EnInvadepoh* this) {
substruct->unk2C = 1000;
}
Animation_MorphToLoop(&this->skelAnime, &D_06009E58, -10.0f);
Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_009E58, -10.0f);
this->actionFunc = func_80B48AD4;
}
@@ -2732,7 +2688,7 @@ void func_80B48DE4(EnInvadepoh* this) {
AlienBehaviorInfo* substruct = &this->behaviorInfo;
this->actor.speedXZ = 0.0f;
Animation_MorphToLoop(&this->skelAnime, &D_06009E58, -10.0f);
Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_009E58, -10.0f);
this->behaviorInfo.unk4C = 0;
substruct->unk30 = 0.05f;
substruct->unk2C = 1200;
@@ -2769,8 +2725,8 @@ void func_80B48FB0(Actor* thisx, GlobalContext* globalCtx) {
this->actor.update = func_80B490F0;
this->actor.draw = func_80B4E324;
this->actor.textId = 0x3330;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013928, &D_06009E58, this->jointTable, this->morphTable,
23);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma1_Skel_013928, &object_ma1_Anim_009E58,
this->jointTable, this->morphTable, 23);
func_80B45C04(&this->behaviorInfo, D_80B4EA90, 6, D_80B4EB00, 2, &gZeroVec3s, 100, 0.03, 0.3, 0.03);
func_80B444F4(this, globalCtx);
EnInvadepoh_SetPathPointToWorldPos(this, 0);
@@ -3039,7 +2995,7 @@ void func_80B49B1C(Actor* thisx, GlobalContext* globalCtx) {
void func_80B49BD0(EnInvadepoh* this) {
AlienBehaviorInfo* substruct = &this->behaviorInfo;
Animation_MorphToLoop(&this->skelAnime, &D_06014088, -10.0f);
Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_014088, -10.0f);
substruct->unk26.x = 0;
substruct->unk26.y = 0;
substruct->unk26.z = 0;
@@ -3083,7 +3039,7 @@ void func_80B49DA0(EnInvadepoh* this) {
this->behaviorInfo.unk30 = 0.08f;
this->behaviorInfo.unk2C = 2000;
this->behaviorInfo.unk4C = 0;
Animation_MorphToLoop(&this->skelAnime, &D_06009E58, -10.0f);
Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_009E58, -10.0f);
this->actionFunc = func_80B49DFC;
}
@@ -3121,8 +3077,8 @@ void func_80B49F88(Actor* thisx, GlobalContext* globalCtx) {
this->actor.objBankIndex = this->bankIndex;
Actor_SetObjectDependency(globalCtx, &this->actor);
func_80B44F58();
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013928, &D_06014088, this->jointTable, this->morphTable,
23);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma1_Skel_013928, &object_ma1_Anim_014088,
this->jointTable, this->morphTable, 23);
func_80B45C04(&this->behaviorInfo, D_80B4EA90, 1, D_80B4EB00, 1, &gZeroVec3s, 100, 0.03, 0.3, 0.03);
func_80B44540(this, globalCtx);
func_80B44570(this);
@@ -3188,7 +3144,7 @@ void func_80B4A1B8(Actor* thisx, GlobalContext* globalCtx) {
void func_80B4A2C0(EnInvadepoh* this) {
AlienBehaviorInfo* substruct = &this->behaviorInfo;
Animation_MorphToLoop(&this->skelAnime, &D_06009E58, -10.0f);
Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_009E58, -10.0f);
substruct->unk26.x = 0;
substruct->unk26.y = 0;
substruct->unk26.z = 0;
@@ -3247,7 +3203,7 @@ void func_80B4A350(EnInvadepoh* this, GlobalContext* globalCtx) {
void func_80B4A570(EnInvadepoh* this) {
AlienBehaviorInfo* substruct = &this->behaviorInfo;
Animation_MorphToPlayOnce(&this->skelAnime, &D_06002A8C, -10.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_ma1_Anim_002A8C, -10.0f);
substruct->unk26.x = 0;
substruct->unk26.y = 0;
substruct->unk26.z = 0;
@@ -3266,7 +3222,7 @@ void func_80B4A5E4(EnInvadepoh* this, GlobalContext* globalCtx) {
void func_80B4A614(EnInvadepoh* this) {
AlienBehaviorInfo* substruct = &this->behaviorInfo;
Animation_MorphToLoop(&this->skelAnime, &D_06014088, 0.0f);
Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_014088, 0.0f);
substruct->unk26.x = 0;
substruct->unk26.y = 0;
substruct->unk26.z = 0;
@@ -3309,7 +3265,7 @@ void func_80B4A7C0(EnInvadepoh* this) {
this->behaviorInfo.unk30 = 0.08f;
this->behaviorInfo.unk2C = 2000;
this->behaviorInfo.unk4C = 0;
Animation_MorphToLoop(&this->skelAnime, &D_06009E58, 0.0f);
Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_009E58, 0.0f);
this->actionFunc = func_80B4A81C;
}
@@ -3352,8 +3308,8 @@ void func_80B4A9C8(Actor* thisx, GlobalContext* globalCtx) {
this->actor.objBankIndex = this->bankIndex;
Actor_SetObjectDependency(globalCtx, &this->actor);
func_80B44F58();
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013928, &D_06014088, this->jointTable, this->morphTable,
23);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma1_Skel_013928, &object_ma1_Anim_014088,
this->jointTable, this->morphTable, 23);
func_80B45C04(&this->behaviorInfo, D_80B4EA90, 1, D_80B4EB00, 1, &gZeroVec3s, 100, 0.03f, 0.3f, 0.03f);
func_80B44620(this, globalCtx);
if ((sp38 < CLOCK_TIME(2, 15)) || (sp38 >= CLOCK_TIME(6, 0))) {
@@ -3527,9 +3483,9 @@ void func_80B4B0C4(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetObjectDependency(globalCtx, &this->actor);
func_80B44F58();
this->actor.update = func_80B4B218;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013928, &D_06014088, this->jointTable, this->morphTable,
23);
Animation_MorphToLoop(&this->skelAnime, &D_06009E58, 0.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma1_Skel_013928, &object_ma1_Anim_014088,
this->jointTable, this->morphTable, 23);
Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_009E58, 0.0f);
substruct = &this->behaviorInfo;
func_80B45C04(&this->behaviorInfo, D_80B4EA90, 1, D_80B4EB00, 3, &gZeroVec3s, 2000, 0.08f, 0.3f, 0.03f);
substruct->unk30 = 0.08f;
@@ -3576,7 +3532,7 @@ void func_80B4B3DC(EnInvadepoh* this) {
}
void func_80B4B430(EnInvadepoh* this) {
Animation_MorphToLoop(&this->skelAnime, &D_060021C8, -6.0f);
Animation_MorphToLoop(&this->skelAnime, &object_dog_Anim_0021C8, -6.0f);
this->actionTimer = Rand_S16Offset(50, 80);
this->actionFunc = func_80B4B484;
}
@@ -3599,7 +3555,7 @@ void func_80B4B484(EnInvadepoh* this, GlobalContext* globalCtx) {
}
void func_80B4B510(EnInvadepoh* this) {
Animation_MorphToLoop(&this->skelAnime, &D_06001BD8, -6.0f);
Animation_MorphToLoop(&this->skelAnime, &object_dog_Anim_001BD8, -6.0f);
this->actionTimer = Rand_S16Offset(50, 200);
this->actionFunc = func_80B4B564;
}
@@ -3643,7 +3599,7 @@ void func_80B4B564(EnInvadepoh* this, GlobalContext* globalCtx) {
}
void func_80B4B724(EnInvadepoh* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06000998, -6.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dog_Anim_000998, -6.0f);
this->actionFunc = func_80B4B768;
}
@@ -3663,7 +3619,7 @@ void func_80B4B768(EnInvadepoh* this, GlobalContext* globalCtx) {
}
void func_80B4B820(EnInvadepoh* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06001560, -6.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dog_Anim_001560, -6.0f);
this->actionFunc = func_80B4B864;
}
@@ -3682,8 +3638,8 @@ void func_80B4B8BC(Actor* thisx, GlobalContext* globalCtx) {
if (Object_IsLoaded(&globalCtx->objectCtx, this->bankIndex)) {
this->actor.objBankIndex = this->bankIndex;
Actor_SetObjectDependency(globalCtx, &this->actor);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060080F0, &D_060021C8, this->jointTable, this->morphTable,
13);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dog_Skel_0080F0, &object_dog_Anim_0021C8,
this->jointTable, this->morphTable, 13);
func_80B45C04(&this->behaviorInfo, 0, 0, 0, 0, &gZeroVec3s, 3000, 0.1f, 0.0f, 0.0f);
func_80B44664(this, globalCtx);
EnInvadepoh_SetPathPointToWorldPos(this, 0);
@@ -3763,7 +3719,7 @@ void func_80B4BA84(Actor* thisx, GlobalContext* globalCtx) {
void func_80B4BBE0(EnInvadepoh* this) {
AlienBehaviorInfo* substruct = &this->behaviorInfo;
Animation_MorphToLoop(&this->skelAnime, &D_06016720, -6.0f);
Animation_MorphToLoop(&this->skelAnime, &object_ma2_Anim_016720, -6.0f);
substruct->unk26.x = 0;
substruct->unk26.y = 0;
substruct->unk26.z = 0;
@@ -3844,7 +3800,7 @@ void func_80B4BC4C(EnInvadepoh* this, GlobalContext* globalCtx) {
void func_80B4BFFC(EnInvadepoh* this) {
this->behaviorInfo.unk30 = 0.08f;
this->behaviorInfo.unk2C = 2000;
Animation_MorphToLoop(&this->skelAnime, &D_0600A174, -6.0f);
Animation_MorphToLoop(&this->skelAnime, &object_ma2_Anim_00A174, -6.0f);
this->behaviorInfo.unk4C = 0;
this->actionFunc = func_80B4C058;
}
@@ -3876,7 +3832,7 @@ void func_80B4C058(EnInvadepoh* this, GlobalContext* globalCtx) {
void func_80B4C1BC(EnInvadepoh* this) {
this->behaviorInfo.unk30 = 0.08f;
this->behaviorInfo.unk2C = 2000;
Animation_MorphToLoop(&this->skelAnime, &D_0600A174, -6.0f);
Animation_MorphToLoop(&this->skelAnime, &object_ma2_Anim_00A174, -6.0f);
this->behaviorInfo.unk4C = 0;
this->actionFunc = func_80B4C218;
}
@@ -3916,8 +3872,8 @@ void func_80B4C3A0(Actor* thisx, GlobalContext* globalCtx) {
this->actor.objBankIndex = this->bankIndex;
Actor_SetObjectDependency(globalCtx, &this->actor);
func_80B44FEC();
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06015C28, &D_06016720, this->jointTable, this->morphTable,
22);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma2_Skel_015C28, &object_ma2_Anim_016720,
this->jointTable, this->morphTable, 22);
func_80B45C04(&this->behaviorInfo, D_80B4EBDC, 1, D_80B4EC08, 0, &gZeroVec3s, 100, 0.03f, 0.3f, 0.03f);
this->actor.textId = 0x33CD;
if (currentTime < 0xD5A0) {
@@ -3979,7 +3935,7 @@ void func_80B4C5C0(Actor* thisx, GlobalContext* globalCtx) {
void func_80B4C6C8(EnInvadepoh* this) {
AlienBehaviorInfo* substruct = &this->behaviorInfo;
Animation_MorphToLoop(&this->skelAnime, &D_06014088, -10.0f);
Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_014088, -10.0f);
substruct->unk26.x = 0;
substruct->unk26.y = 0;
substruct->unk26.z = 0;
@@ -4069,7 +4025,7 @@ void func_80B4C730(EnInvadepoh* this, GlobalContext* globalCtx) {
void func_80B4CAB0(EnInvadepoh* this) {
this->behaviorInfo.unk30 = 0.08f;
this->behaviorInfo.unk2C = 4000;
Animation_MorphToLoop(&this->skelAnime, &D_06009E58, -10.0f);
Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_009E58, -10.0f);
this->behaviorInfo.unk4C = 0;
this->actionFunc = func_80B4CB0C;
}
@@ -4098,7 +4054,7 @@ void func_80B4CB0C(EnInvadepoh* this, GlobalContext* globalCtx) {
void func_80B4CC70(EnInvadepoh* this) {
this->behaviorInfo.unk30 = 0.08f;
this->behaviorInfo.unk2C = 2000;
Animation_MorphToLoop(&this->skelAnime, &D_06009E58, -10.0f);
Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_009E58, -10.0f);
this->behaviorInfo.unk4C = 0;
this->actionFunc = func_80B4CCCC;
}
@@ -4137,8 +4093,8 @@ void func_80B4CE54(Actor* thisx, GlobalContext* globalCtx) {
this->actor.objBankIndex = this->bankIndex;
Actor_SetObjectDependency(globalCtx, &this->actor);
func_80B44F58();
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013928, &D_06014088, this->jointTable, this->morphTable,
23);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma1_Skel_013928, &object_ma1_Anim_014088,
this->jointTable, this->morphTable, 23);
func_80B45C04(&this->behaviorInfo, D_80B4EA90, 1, D_80B4EB00, 3, &gZeroVec3s, 100, 0.03f, 0.3f, 0.03f);
func_80B446D0(this, globalCtx);
this->actor.world.rot.y = this->actor.shape.rot.y;
@@ -4197,7 +4153,7 @@ void func_80B4D15C(EnInvadepoh* this) {
s32 temp_v1 = this->actor.params & 7;
unkstruct80B4EE0C* temp_v0;
Animation_PlayLoop(&this->skelAnime, &D_06001674);
Animation_PlayLoop(&this->skelAnime, &object_uch_Anim_001674);
this->skelAnime.curFrame = ((this->actor.params & 7) * this->skelAnime.endFrame) * 0.25f;
this->alienAlpha = 255;
this->actor.draw = func_80B4DB14;
@@ -4249,7 +4205,7 @@ void func_80B4D290(EnInvadepoh* this, GlobalContext* globalCtx) {
}
void func_80B4D3E4(EnInvadepoh* this) {
Animation_PlayLoop(&this->skelAnime, &D_06001674);
Animation_PlayLoop(&this->skelAnime, &object_uch_Anim_001674);
this->skelAnime.curFrame = (this->actor.params & 7) * this->skelAnime.endFrame * 0.25f;
this->alienAlpha = 255;
this->actor.draw = NULL;
@@ -4326,8 +4282,8 @@ void func_80B4D670(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetObjectDependency(globalCtx, &this->actor);
func_80B45080();
this->actor.update = func_80B4D760;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004E50, &D_06001674, this->jointTable, this->morphTable,
14);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_uch_Skel_004E50, &object_uch_Anim_001674,
this->jointTable, this->morphTable, 14);
if (invadepohType < 3) {
func_80B453F4(this, globalCtx, invadepohType);
func_80B4D15C(this);
@@ -4372,7 +4328,7 @@ void func_80B4D7B8(GlobalContext* globalCtx) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, temp_s5, 0, 0x20, 0x40, 1, 0, temp_s6, 0x20, 0x40));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, &D_0402E510);
gSPDisplayList(POLY_XLU_DISP++, &gameplay_keep_DL_02E510);
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
@@ -4449,10 +4405,10 @@ void func_80B4DB14(Actor* thisx, GlobalContext* globalCtx) {
gDPSetEnvColor(spBC++, 255, 255, 255, this->alienBeamAlpha * (150.0f / 255.0f));
Matrix_InsertMatrix(&D_80B502A0, MTXMODE_NEW);
gSPMatrix(spBC++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(spBC++, D_06000080);
gSPDisplayList(spBC++, object_uch_DL_000080);
Matrix_InsertMatrix(&D_80B502E0, MTXMODE_NEW);
gSPMatrix(spBC++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(spBC++, D_06000080);
gSPDisplayList(spBC++, object_uch_DL_000080);
spB8->polyXlu.p = spBC;
}
}
@@ -4464,7 +4420,7 @@ void func_80B4DB14(Actor* thisx, GlobalContext* globalCtx) {
MTXMODE_APPLY);
gSPMatrix(spCC->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(spCC->polyXlu.p++, D_06000720);
gSPDisplayList(spCC->polyXlu.p++, object_uch_DL_000720);
}
if (this->drawAlien) {
@@ -4487,10 +4443,10 @@ void func_80B4DB14(Actor* thisx, GlobalContext* globalCtx) {
Matrix_InsertTranslation(sp74.x, sp74.y, sp74.z, MTXMODE_NEW);
Matrix_Scale(0.25f, 0.25f, 0.25f, MTXMODE_APPLY);
alpha2 = this->alienAlpha * (100.0f / 255.0f);
gSPDisplayList(gfx++, D_04029CB0);
gSPDisplayList(gfx++, gameplay_keep_DL_029CB0);
gDPSetPrimColor(gfx++, 0, 0, 240, 180, 100, alpha2);
gSPMatrix(gfx++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfx++, D_04029CF0);
gSPDisplayList(gfx++, gameplay_keep_DL_029CF0);
sp6C->polyXlu.p = gfx;
if ((this->alienAlpha > 128) && func_80B456A8(globalCtx, &sp74)) {
func_800F9824(globalCtx, &globalCtx->envCtx, &globalCtx->view, globalCtx->state.gfxCtx, sp74, 10.0f, 9.0f,
@@ -4547,7 +4503,7 @@ void func_80B4E2AC(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s*
if (limbIndex == 19) {
OPEN_DISPS(globalCtx->state.gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, D_060003B0);
gSPDisplayList(POLY_OPA_DISP++, object_ma1_DL_0003B0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
} else if (limbIndex == 14) {
Matrix_MultiplyVector3fByState(&D_80B4EE30, &this->actor.focus.pos);
@@ -4585,7 +4541,7 @@ void func_80B4E3F0(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0xFF, 0x80, 255, 255, 0, 180);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 50, 0, 0);
gSPDisplayList(POLY_XLU_DISP++, D_04023210);
gSPDisplayList(POLY_XLU_DISP++, gOwlStatueWhiteFlashDL);
if (func_80B456A8(globalCtx, &sp5C)) {
func_800F9824(globalCtx, &globalCtx->envCtx, &globalCtx->view, globalCtx->state.gfxCtx, sp5C, 20.0f, 9.0f, 0,
0);
src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c
+2 -3
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_jc_mato.h"
#include "objects/object_tru/object_tru.h"
#define FLAGS 0x00004030
@@ -86,8 +87,6 @@ static DamageTable sDamageTable = {
/* Powder Keg */ DMG_ENTRY(1, 0x0),
};
extern Gfx D_06000390[];
s32 EnJcMato_CheckForHit(EnJcMato* this, GlobalContext* globalCtx) {
this->collider.dim.worldSphere.center.x = this->pos.x;
this->collider.dim.worldSphere.center.y = this->pos.y;
@@ -162,7 +161,7 @@ void EnJcMato_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06000390);
gSPDisplayList(POLY_OPA_DISP++, object_tru_DL_000390);
Matrix_MultiplyVector3fByState(&movement, &this->pos);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
+5 -14
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_kakasi.h"
#include "objects/object_ka/object_ka.h"
#define FLAGS 0x02000019
@@ -125,18 +126,10 @@ typedef enum {
/* 0x8 */ ENKAKASI_ANIM_IDLE, // slow stretching wiggle, ends in regular position
} EnKakasi_Animations;
extern AnimationHeader D_06007444;
extern AnimationHeader D_0600686C;
extern AnimationHeader D_060081A4;
extern AnimationHeader D_06007B90;
extern AnimationHeader D_060071EC;
extern AnimationHeader D_06007444;
extern AnimationHeader D_0600686C;
extern AnimationHeader D_060081A4;
extern AnimationHeader D_06000214;
static AnimationHeader* kakasiAnimations[] = {
&D_06007444, &D_0600686C, &D_060081A4, &D_06007B90, &D_060071EC, &D_06007444, &D_0600686C, &D_060081A4, &D_06000214,
&object_ka_Anim_007444, &object_ka_Anim_00686C, &object_ka_Anim_0081A4,
&object_ka_Anim_007B90, &object_ka_Anim_0071EC, &object_ka_Anim_007444,
&object_ka_Anim_00686C, &object_ka_Anim_0081A4, &object_ka_Anim_000214,
};
static u8 sAnimModes[] = { ANIMMODE_LOOP, ANIMMODE_LOOP, ANIMMODE_LOOP, ANIMMODE_ONCE, ANIMMODE_ONCE,
@@ -148,15 +141,13 @@ void EnKakasi_Destroy(Actor* thisx, GlobalContext* globalCtx) {
Collider_DestroyCylinder(globalCtx, &this->collider);
}
extern FlexSkeletonHeader D_060065B0;
void EnKakasi_Init(Actor* thisx, GlobalContext* globalCtx) {
EnKakasi* this = THIS;
s32 tempCutscene;
s32 i;
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &D_80971D80);
SkelAnime_InitFlex(globalCtx, &this->skelanime, &D_060065B0, &D_06000214, 0, 0, 0);
SkelAnime_InitFlex(globalCtx, &this->skelanime, &object_ka_Skel_0065B0, &object_ka_Anim_000214, 0, 0, 0);
this->songSummonDist = GET_KAKASI_SUMMON_DISTANCE(this) * 20.0f;
if (this->songSummonDist < 40.0f) {
src/overlays/actors/ovl_En_Kgy/z_en_kgy.c
+13 -27
View File
@@ -7,6 +7,8 @@
#include "overlays/actors/ovl_En_Kbt/z_en_kbt.h"
#include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h"
#include "z_en_kgy.h"
#include "objects/object_kgy/object_kgy.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000009
@@ -31,24 +33,6 @@ void func_80B425A0(EnKgy* this, GlobalContext* globalCtx);
void func_80B42714(EnKgy* this, GlobalContext* globalCtx);
void func_80B42D28(EnKgy* this, GlobalContext* globalCtx);
extern AnimationHeader D_060008FC;
extern AnimationHeader D_06001764;
extern Gfx D_04001D00[];
extern AnimationHeader D_06001EA4;
extern Gfx D_040021A8[];
extern AnimationHeader D_0600292C;
extern AnimationHeader D_06003334;
extern AnimationHeader D_06003D88;
extern AnimationHeader D_060042E4;
extern AnimationHeader D_06004B98;
extern Gfx D_0600E8F0[];
extern Gfx D_0600EE58[];
extern Gfx D_0600F180[];
extern Gfx D_0600F6A0[];
extern FlexSkeletonHeader D_0600F910;
extern AnimationHeader D_06010B84;
extern AnimationHeader D_060101F0;
const ActorInit En_Kgy_InitVars = {
ACTOR_EN_KGY,
ACTORCAT_NPC,
@@ -67,7 +51,8 @@ void EnKgy_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 i;
Actor_SetScale(&this->actor, 0.01f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600F910, &D_06004B98, this->jointTable, this->morphTable, 23);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_kgy_Skel_00F910, &object_kgy_Anim_004B98, this->jointTable,
this->morphTable, 23);
this->unk_2D2 = -1;
this->unk_29C = 0;
this->unk_2E4 = 0;
@@ -127,8 +112,9 @@ void EnKgy_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void EnKgy_ChangeAnim(EnKgy* this, s16 animIndex, u8 mode, f32 transitionRate) {
static AnimationHeader* sAnimations[] = {
&D_06004B98, &D_060008FC, &D_0600292C, &D_060042E4, &D_060101F0,
&D_06001764, &D_06003334, &D_06010B84, &D_06001EA4, &D_06003D88,
&object_kgy_Anim_004B98, &object_kgy_Anim_0008FC, &object_kgy_Anim_00292C, &object_kgy_Anim_0042E4,
&object_kgy_Anim_0101F0, &object_kgy_Anim_001764, &object_kgy_Anim_003334, &object_kgy_Anim_010B84,
&object_kgy_Anim_001EA4, &object_kgy_Anim_003D88,
};
Animation_Change(&this->skelAnime, sAnimations[animIndex], 1.0f, 0.0f,
@@ -1155,20 +1141,20 @@ void func_80B43074(EnKgy* this, GlobalContext* globalCtx) {
Matrix_InsertXRotation_s(0x4000, MTXMODE_APPLY);
if (func_80B40D8C(globalCtx)) {
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(D_0600F6A0));
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_kgy_Matanimheader_00F6A0));
} else {
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(D_0600EE58));
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_kgy_Matanimheader_00EE58));
}
gfx = POLY_OPA_DISP;
gSPMatrix(gfx, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (func_80B40D8C(globalCtx)) {
gSPDisplayList(&gfx[1], D_04001D00);
gSPDisplayList(&gfx[2], D_0600F180);
gSPDisplayList(&gfx[1], gameplay_keep_DL_001D00);
gSPDisplayList(&gfx[2], object_kgy_DL_00F180);
} else {
gSPDisplayList(&gfx[1], D_040021A8);
gSPDisplayList(&gfx[2], D_0600E8F0);
gSPDisplayList(&gfx[1], gameplay_keep_DL_0021A8);
gSPDisplayList(&gfx[2], object_kgy_DL_00E8F0);
}
POLY_OPA_DISP = &gfx[3];
src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c
+8 -6
View File
@@ -5,6 +5,8 @@
*/
#include "z_en_kusa2.h"
#include "objects/gameplay_field_keep/gameplay_field_keep.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00800010
@@ -1308,8 +1310,8 @@ void EnKusa2_Update(Actor* thisx, GlobalContext* globalCtx) {
void func_80A5E6F0(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* D_80A5EB68[] = {
D_040528B0,
D_040527F0,
gameplay_keep_DL_0528B0,
gameplay_keep_DL_0527F0,
};
EnKusa2* this = THIS;
s32 i;
@@ -1341,7 +1343,7 @@ void func_80A5E80C(GlobalContext* globalCtx, s32 arg1) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, arg1);
gSPDisplayList(POLY_XLU_DISP++, D_05007938);
gSPDisplayList(POLY_XLU_DISP++, gameplay_field_keep_DL_007938);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -1354,7 +1356,7 @@ void EnKusa2_Draw(Actor* thisx, GlobalContext* globalCtx) {
(this->actor.projectedPos.z < 400.0f)) {
func_80A5B954(&D_80A60908[this->unk_1CE], 0.0015f);
}
Gfx_DrawDListOpa(globalCtx, D_050078A0);
Gfx_DrawDListOpa(globalCtx, gameplay_field_keep_DL_0078A0);
} else if (this->actor.projectedPos.z < 1300.0f) {
func_80A5E80C(globalCtx, (1300.0f - this->actor.projectedPos.z) * 2.55f);
}
@@ -1368,14 +1370,14 @@ void func_80A5E9B4(Actor* thisx, GlobalContext* globalCtx) {
sp18.z = thisx->shape.rot.z + D_80A5EAFC.z;
Matrix_SetStateRotationAndTranslation(thisx->world.pos.x, thisx->world.pos.y, thisx->world.pos.z, &sp18);
Matrix_Scale(thisx->scale.x, thisx->scale.y, thisx->scale.z, MTXMODE_APPLY);
Gfx_DrawDListOpa(globalCtx, D_050078A0);
Gfx_DrawDListOpa(globalCtx, gameplay_field_keep_DL_0078A0);
}
void func_80A5EA48(Actor* thisx, GlobalContext* globalCtx) {
EnKusa2* this = THIS;
if (this->unk_1CF == 0xFF) {
Gfx_DrawDListOpa(globalCtx, D_050078A0);
Gfx_DrawDListOpa(globalCtx, gameplay_field_keep_DL_0078A0);
} else {
func_80A5E80C(globalCtx, this->unk_1CF);
}
src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
+35 -53
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_ma4.h"
#include "objects/object_ma1/object_ma1.h"
#define FLAGS 0x02000039
@@ -54,35 +55,6 @@ typedef enum {
/* 3 */ MA4_STATE_AFTERDESCRIBETHEMCS,
} EnMa4State;
extern FlexSkeletonHeader D_06013928;
extern AnimationHeader D_06009E58;
extern AnimationHeader D_06002A8C;
extern AnimationHeader D_06018948;
extern AnimationHeader D_0601B76C;
extern AnimationHeader D_06007328;
extern AnimationHeader D_06014088;
extern AnimationHeader D_06015B7C;
extern AnimationHeader D_06007D98;
extern AnimationHeader D_0600852C;
extern AnimationHeader D_06008F6C;
extern u64 D_0600FFC8[];
extern u64 D_060107C8[];
extern u64 D_06010FC8[];
extern u64 D_060117C8[];
extern u64 D_06011FC8[];
extern u64 D_060127C8[];
extern u64 D_06012BC8[];
extern u64 D_06012FC8[];
extern u64 D_060133C8[];
extern Gfx D_060003B0[];
// Box
extern Gfx D_06000A20[];
const ActorInit En_Ma4_InitVars = {
ACTOR_EN_MA4,
ACTORCAT_NPC,
@@ -117,15 +89,15 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 D_80AC00DC = { 0, 0, 0, 0, MASS_IMMOVABLE };
static void* sEyeTextures[] = {
D_0600FFC8, D_060107C8, D_06010FC8, D_060117C8, D_06011FC8,
static TexturePtr sEyeTextures[] = {
object_ma1_Tex_00FFC8, object_ma1_Tex_0107C8, object_ma1_Tex_010FC8, object_ma1_Tex_0117C8, object_ma1_Tex_011FC8,
};
static void* sMouthTextures[] = {
D_060127C8,
D_06012BC8,
D_06012FC8,
D_060133C8,
static TexturePtr sMouthTextures[] = {
object_ma1_Tex_0127C8,
object_ma1_Tex_012BC8,
object_ma1_Tex_012FC8,
object_ma1_Tex_0133C8,
};
void EnMa4_UpdateEyes(EnMa4* this) {
@@ -141,16 +113,26 @@ void EnMa4_UpdateEyes(EnMa4* this) {
}
static struct_80B8E1A8 sAnimationInfo[] = {
{ &D_06009E58, 1.0f, 0, 0.0f }, { &D_06009E58, 1.0f, 0, -6.0f }, // Idle anim
{ &D_06002A8C, 1.0f, 0, 0.0f }, { &D_06002A8C, 1.0f, 0, -6.0f }, // Looking around anim
{ &D_06018948, 1.0f, 2, 0.0f }, { &D_06018948, 1.0f, 2, -6.0f }, // Starts holding hands anim
{ &D_0601B76C, 1.0f, 0, 0.0f }, { &D_0601B76C, 1.0f, 0, -6.0f }, // Holnding hands anim
{ &D_06007328, 1.0f, 0, 0.0f }, { &D_06007328, 1.0f, 0, -6.0f }, // Walking anim
{ &D_06014088, 1.0f, 0, 0.0f }, { &D_06014088, 1.0f, 0, -6.0f }, //
{ &D_06015B7C, 1.0f, 2, 0.0f }, { &D_06015B7C, 1.0f, 2, -6.0f }, // Shoot arrow anim
{ &D_06007D98, 1.0f, 0, 0.0f }, { &D_06007D98, 1.0f, 0, -6.0f }, // Sitting anim
{ &D_0600852C, 1.0f, 0, 0.0f }, { &D_0600852C, 1.0f, 0, -6.0f }, // Sitting traumatized anim
{ &D_06008F6C, 1.0f, 0, 0.0f }, { &D_06008F6C, 1.0f, 0, -6.0f }, // Sitting sad anim
{ &object_ma1_Anim_009E58, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_009E58, 1.0f, 0, -6.0f }, // Idle anim
{ &object_ma1_Anim_002A8C, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_002A8C, 1.0f, 0, -6.0f }, // Looking around anim
{ &object_ma1_Anim_018948, 1.0f, 2, 0.0f },
{ &object_ma1_Anim_018948, 1.0f, 2, -6.0f }, // Starts holding hands anim
{ &object_ma1_Anim_01B76C, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_01B76C, 1.0f, 0, -6.0f }, // Holnding hands anim
{ &object_ma1_Anim_007328, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_007328, 1.0f, 0, -6.0f }, // Walking anim
{ &object_ma1_Anim_014088, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_014088, 1.0f, 0, -6.0f }, //
{ &object_ma1_Anim_015B7C, 1.0f, 2, 0.0f },
{ &object_ma1_Anim_015B7C, 1.0f, 2, -6.0f }, // Shoot arrow anim
{ &object_ma1_Anim_007D98, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_007D98, 1.0f, 0, -6.0f }, // Sitting anim
{ &object_ma1_Anim_00852C, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_00852C, 1.0f, 0, -6.0f }, // Sitting traumatized anim
{ &object_ma1_Anim_008F6C, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_008F6C, 1.0f, 0, -6.0f }, // Sitting sad anim
};
void EnMa4_ChangeAnim(EnMa4* this, s32 index) {
@@ -163,9 +145,9 @@ void func_80ABDD9C(EnMa4* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
s16 flag;
if (this->unk_1D8.unk_00 == 0 &&
((this->skelAnime.animation == &D_06007328) || (this->skelAnime.animation == &D_06002A8C) ||
(this->skelAnime.animation == &D_06015B7C))) {
if (this->unk_1D8.unk_00 == 0 && ((this->skelAnime.animation == &object_ma1_Anim_007328) ||
(this->skelAnime.animation == &object_ma1_Anim_002A8C) ||
(this->skelAnime.animation == &object_ma1_Anim_015B7C))) {
flag = 1;
} else {
flag = (this->type == MA4_TYPE_ALIENS_WON && this->actionFunc != EnMa4_DialogueHandler) ? 1 : 0;
@@ -201,7 +183,7 @@ void EnMa4_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013928, NULL, this->jointTable, this->morphTable,
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma1_Skel_013928, NULL, this->jointTable, this->morphTable,
MA1_LIMB_MAX);
Collider_InitCylinder(globalCtx, &this->collider);
@@ -318,7 +300,7 @@ void EnMa4_RunInCircles(EnMa4* this, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
Actor_MoveWithGravity(&this->actor);
if (this->skelAnime.animation == &D_06007328) { // Walking animation
if (this->skelAnime.animation == &object_ma1_Anim_007328) { // Walking animation
if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 4.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_ROMANI_WALK);
}
@@ -1074,7 +1056,7 @@ void EnMa4_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
} else if (limbIndex == MA1_LIMB_HAND_LEFT) {
if (this->hasBow == true) {
OPEN_DISPS(globalCtx->state.gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, D_060003B0);
gSPDisplayList(POLY_OPA_DISP++, object_ma1_DL_0003B0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
@@ -1086,7 +1068,7 @@ void EnMa4_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
if (this->type == MA4_TYPE_ALIENS_WON) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06000A20);
gSPDisplayList(POLY_OPA_DISP++, object_ma1_DL_000A20);
}
func_8012C28C(globalCtx->state.gfxCtx);
src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c
+30 -56
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_ma_yto.h"
#include "objects/object_ma2/object_ma2.h"
#define FLAGS 0x02100009
@@ -108,60 +109,31 @@ static CollisionCheckInfoInit2 sColChkInfoInit2 = {
0, 0, 0, 0, MASS_IMMOVABLE,
};
extern FlexSkeletonHeader D_06015C28;
extern AnimationHeader D_0600A174;
extern AnimationHeader D_0600AF7C;
extern AnimationHeader D_06000CC0;
extern AnimationHeader D_06016720;
extern AnimationHeader D_06005314;
extern AnimationHeader D_060093E8;
extern AnimationHeader D_06007E28;
extern AnimationHeader D_060070EC;
extern AnimationHeader D_06003D54;
extern AnimationHeader D_06001FD0;
extern AnimationHeader D_060030B4;
extern AnimationHeader D_06004370;
extern void* D_06014AD8[];
extern void* D_06014ED8[];
extern void* D_060152D8[];
extern void* D_060156D8[];
extern void* D_06011AD8[];
extern void* D_060122D8[];
extern void* D_06012AD8[];
extern void* D_060132D8[];
extern void* D_06013AD8[];
extern void* D_060142D8[];
// gCremiaWoodenBox
extern Gfx D_06005430[];
static struct_80B8E1A8 sAnimationInfo[] = {
{ &D_0600A174, 1.0f, 0, 0.0f }, { &D_0600A174, 1.0f, 0, -6.0f }, //
{ &D_0600AF7C, 1.0f, 2, 0.0f }, { &D_0600AF7C, 1.0f, 2, -6.0f }, //
{ &D_06000CC0, 1.0f, 0, 0.0f }, { &D_06000CC0, 1.0f, 0, -6.0f }, //
{ &D_06016720, 1.0f, 0, 0.0f }, { &D_06016720, 1.0f, 0, -8.0f }, //
{ &D_06005314, 1.0f, 0, 0.0f }, { &D_06005314, 1.0f, 0, -8.0f }, //
{ &D_060093E8, 1.0f, 0, 0.0f }, { &D_060093E8, 1.0f, 0, -10.0f }, //
{ &D_06007E28, 1.0f, 0, 0.0f }, { &D_06007E28, 1.0f, 0, -8.0f }, //
{ &D_060070EC, 1.0f, 0, 0.0f }, { &D_060070EC, 1.0f, 0, -8.0f }, //
{ &D_06003D54, 1.0f, 0, 0.0f }, { &D_06003D54, 1.0f, 0, -8.0f }, //
{ &D_06001FD0, 1.0f, 0, 0.0f }, { &D_06001FD0, 1.0f, 0, -8.0f }, //
{ &D_060030B4, 1.0f, 0, 0.0f }, { &D_060030B4, 1.0f, 0, -8.0f }, //
{ &D_06004370, 1.0f, 0, 0.0f }, { &D_06004370, 1.0f, 0, -8.0f }, //
{ &object_ma2_Anim_00A174, 1.0f, 0, 0.0f }, { &object_ma2_Anim_00A174, 1.0f, 0, -6.0f }, //
{ &object_ma2_Anim_00AF7C, 1.0f, 2, 0.0f }, { &object_ma2_Anim_00AF7C, 1.0f, 2, -6.0f }, //
{ &object_ma2_Anim_000CC0, 1.0f, 0, 0.0f }, { &object_ma2_Anim_000CC0, 1.0f, 0, -6.0f }, //
{ &object_ma2_Anim_016720, 1.0f, 0, 0.0f }, { &object_ma2_Anim_016720, 1.0f, 0, -8.0f }, //
{ &object_ma2_Anim_005314, 1.0f, 0, 0.0f }, { &object_ma2_Anim_005314, 1.0f, 0, -8.0f }, //
{ &object_ma2_Anim_0093E8, 1.0f, 0, 0.0f }, { &object_ma2_Anim_0093E8, 1.0f, 0, -10.0f }, //
{ &object_ma2_Anim_007E28, 1.0f, 0, 0.0f }, { &object_ma2_Anim_007E28, 1.0f, 0, -8.0f }, //
{ &object_ma2_Anim_0070EC, 1.0f, 0, 0.0f }, { &object_ma2_Anim_0070EC, 1.0f, 0, -8.0f }, //
{ &object_ma2_Anim_003D54, 1.0f, 0, 0.0f }, { &object_ma2_Anim_003D54, 1.0f, 0, -8.0f }, //
{ &object_ma2_Anim_001FD0, 1.0f, 0, 0.0f }, { &object_ma2_Anim_001FD0, 1.0f, 0, -8.0f }, //
{ &object_ma2_Anim_0030B4, 1.0f, 0, 0.0f }, { &object_ma2_Anim_0030B4, 1.0f, 0, -8.0f }, //
{ &object_ma2_Anim_004370, 1.0f, 0, 0.0f }, { &object_ma2_Anim_004370, 1.0f, 0, -8.0f }, //
};
static void* sMouthTextures[] = {
D_06014AD8,
D_06014ED8,
D_060152D8,
D_060156D8,
static TexturePtr sMouthTextures[] = {
object_ma2_Tex_014AD8,
object_ma2_Tex_014ED8,
object_ma2_Tex_0152D8,
object_ma2_Tex_0156D8,
};
static void* sEyesTextures[] = {
D_06011AD8, D_060122D8, D_06012AD8, D_060132D8, D_06013AD8, D_060142D8,
static TexturePtr sEyesTextures[] = {
object_ma2_Tex_011AD8, object_ma2_Tex_0122D8, object_ma2_Tex_012AD8,
object_ma2_Tex_0132D8, object_ma2_Tex_013AD8, object_ma2_Tex_0142D8,
};
void EnMaYto_Init(Actor* thisx, GlobalContext* globalCtx) {
@@ -189,7 +161,7 @@ void EnMaYto_Init(Actor* thisx, GlobalContext* globalCtx) {
}
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06015C28, NULL, this->jointTable, this->morphTable,
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma2_Skel_015C28, NULL, this->jointTable, this->morphTable,
MA2_LIMB_MAX);
EnMaYto_InitAnimation(this, globalCtx);
@@ -464,7 +436,7 @@ void EnMaYto_DefaultDialogueHandler(EnMaYto* this, GlobalContext* globalCtx) {
}
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 5, 0x3000, 0x100);
if (this->textId == 0x3395 && this->skelAnime.animation == &D_0600AF7C &&
if (this->textId == 0x3395 && this->skelAnime.animation == &object_ma2_Anim_00AF7C &&
Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
EnMaYto_ChangeAnim(this, 4);
}
@@ -1081,7 +1053,7 @@ void EnMaYto_WarmFuzzyFeelingCs(EnMaYto* this, GlobalContext* globalCtx) {
}
func_800EDF24(&this->actor, globalCtx, csActionIndex);
if (D_80B915F0 == 2 && this->skelAnime.animation == &D_06001FD0 &&
if (D_80B915F0 == 2 && this->skelAnime.animation == &object_ma2_Anim_001FD0 &&
Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
EnMaYto_ChangeAnim(this, 20);
}
@@ -1464,12 +1436,14 @@ s32 EnMaYto_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
rot->x += sp4.y;
rot->z += sp4.x;
} else if (limbIndex == MA2_LIMB_TORSO) {
if (this->skelAnime.animation != &D_06007E28 && this->skelAnime.animation != &D_06003D54) {
if (this->skelAnime.animation != &object_ma2_Anim_007E28 &&
this->skelAnime.animation != &object_ma2_Anim_003D54) {
sp4 = this->unk_1D8.unk_0E;
rot->x += sp4.y;
if (this->skelAnime.animation == &D_0600A174 || this->skelAnime.animation == &D_060070EC ||
this->skelAnime.animation == &D_06003D54) {
if (this->skelAnime.animation == &object_ma2_Anim_00A174 ||
this->skelAnime.animation == &object_ma2_Anim_0070EC ||
this->skelAnime.animation == &object_ma2_Anim_003D54) {
rot->z += sp4.x;
}
}
@@ -1492,7 +1466,7 @@ void EnMaYto_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
if (this->type == MA_YTO_TYPE_BARN && (gSaveContext.weekEventReg[0x16] & 1)) { // Alieans defeated
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06005430);
gSPDisplayList(POLY_OPA_DISP++, gCremiaWoodenBox);
}
func_8012C28C(globalCtx->state.gfxCtx);
src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c
+35 -56
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_ma_yts.h"
#include "objects/object_ma1/object_ma1.h"
#define FLAGS 0x02100009
@@ -29,40 +30,6 @@ void EnMaYts_SetFaceExpression(EnMaYts* this, s16 overrideEyeTexIndex, s16 mouth
void EnMaYts_DrawSleeping(Actor* thisx, GlobalContext* globalCtx);
extern AnimationHeader D_06009E58;
extern AnimationHeader D_06018948;
extern AnimationHeader D_0601B76C;
extern AnimationHeader D_06007328;
extern AnimationHeader D_06014088;
extern AnimationHeader D_06002A8C;
extern AnimationHeader D_06015B7C;
extern AnimationHeader D_06007D98;
extern AnimationHeader D_0600852C;
extern AnimationHeader D_06008F6C;
extern AnimationHeader D_060180DC;
extern u64 D_060127C8[];
extern u64 D_06012BC8[];
extern u64 D_06012FC8[];
extern u64 D_060133C8[];
extern u64 D_0600FFC8[];
extern u64 D_060107C8[];
extern u64 D_06010FC8[];
extern u64 D_060117C8[];
extern u64 D_06011FC8[];
extern FlexSkeletonHeader D_06013928;
extern AnimationHeader D_06009E58;
extern AnimationHeader D_06007D98;
// Bow
extern Gfx D_060003B0[];
// Sleeping
extern Gfx D_060043A0[];
const ActorInit En_Ma_Yts_InitVars = {
ACTOR_EN_MA_YTS,
ACTORCAT_NPC,
@@ -112,28 +79,39 @@ static CollisionCheckInfoInit2 sColChkInfoInit2 = {
};
static struct_80B8E1A8 sAnimationInfo[] = {
{ &D_06009E58, 1.0f, 0, 0.0f }, { &D_06009E58, 1.0f, 0, -6.0f }, // Idle anim
{ &D_06018948, 1.0f, 2, 0.0f }, { &D_06018948, 1.0f, 2, -6.0f }, // Starts holding hands anim
{ &D_0601B76C, 1.0f, 0, 0.0f }, { &D_0601B76C, 1.0f, 0, -6.0f }, // Holnding hands anim
{ &D_06007328, 1.0f, 0, 0.0f }, { &D_06007328, 1.0f, 0, -6.0f }, // Walking anim
{ &D_06014088, 1.0f, 0, 0.0f }, { &D_06014088, 1.0f, 0, -6.0f }, //
{ &D_06002A8C, 1.0f, 0, 0.0f }, { &D_06002A8C, 1.0f, 0, -6.0f }, // Looking around anim
{ &D_06015B7C, 1.0f, 0, 0.0f }, { &D_06015B7C, 1.0f, 0, -6.0f }, // Shoot arrow anim
{ &D_06007D98, 1.0f, 0, 0.0f }, { &D_06007D98, 1.0f, 0, -6.0f }, // Sitting anim
{ &D_0600852C, 1.0f, 0, 0.0f }, { &D_0600852C, 1.0f, 0, -6.0f }, // Sitting traumatized anim
{ &D_06008F6C, 1.0f, 0, 0.0f }, { &D_06008F6C, 1.0f, 0, -6.0f }, // Sitting sad anim
{ &D_060180DC, 1.0f, 2, 0.0f }, { &D_060180DC, 1.0f, 2, -6.0f }, // Turns around anim
{ &object_ma1_Anim_009E58, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_009E58, 1.0f, 0, -6.0f }, // Idle anim
{ &object_ma1_Anim_018948, 1.0f, 2, 0.0f },
{ &object_ma1_Anim_018948, 1.0f, 2, -6.0f }, // Starts holding hands anim
{ &object_ma1_Anim_01B76C, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_01B76C, 1.0f, 0, -6.0f }, // Holnding hands anim
{ &object_ma1_Anim_007328, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_007328, 1.0f, 0, -6.0f }, // Walking anim
{ &object_ma1_Anim_014088, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_014088, 1.0f, 0, -6.0f }, //
{ &object_ma1_Anim_002A8C, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_002A8C, 1.0f, 0, -6.0f }, // Looking around anim
{ &object_ma1_Anim_015B7C, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_015B7C, 1.0f, 0, -6.0f }, // Shoot arrow anim
{ &object_ma1_Anim_007D98, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_007D98, 1.0f, 0, -6.0f }, // Sitting anim
{ &object_ma1_Anim_00852C, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_00852C, 1.0f, 0, -6.0f }, // Sitting traumatized anim
{ &object_ma1_Anim_008F6C, 1.0f, 0, 0.0f },
{ &object_ma1_Anim_008F6C, 1.0f, 0, -6.0f }, // Sitting sad anim
{ &object_ma1_Anim_0180DC, 1.0f, 2, 0.0f },
{ &object_ma1_Anim_0180DC, 1.0f, 2, -6.0f }, // Turns around anim
};
static void* sMouthTextures[] = {
D_060127C8,
D_06012BC8,
D_06012FC8,
D_060133C8,
static TexturePtr sMouthTextures[] = {
object_ma1_Tex_0127C8,
object_ma1_Tex_012BC8,
object_ma1_Tex_012FC8,
object_ma1_Tex_0133C8,
};
static void* sEyeTextures[] = {
D_0600FFC8, D_060107C8, D_06010FC8, D_060117C8, D_06011FC8,
static TexturePtr sEyeTextures[] = {
object_ma1_Tex_00FFC8, object_ma1_Tex_0107C8, object_ma1_Tex_010FC8, object_ma1_Tex_0117C8, object_ma1_Tex_011FC8,
};
void EnMaYts_ChangeAnim(EnMaYts* this, s32 index) {
@@ -247,7 +225,7 @@ void EnMaYts_Init(Actor* thisx, GlobalContext* globalCtx) {
}
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013928, NULL, this->jointTable, this->morphTable,
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma1_Skel_013928, NULL, this->jointTable, this->morphTable,
MA1_LIMB_MAX);
EnMaYts_InitAnimation(this, globalCtx);
@@ -531,7 +509,8 @@ s32 EnMaYts_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
if (limbIndex == MA1_LIMB_HEAD) {
sp4 = this->unk_1D8.unk_08;
rot->x += sp4.y;
if ((this->skelAnime.animation == &D_06009E58) || (this->skelAnime.animation == &D_06007D98)) {
if ((this->skelAnime.animation == &object_ma1_Anim_009E58) ||
(this->skelAnime.animation == &object_ma1_Anim_007D98)) {
rot->z += sp4.x;
}
} else if (limbIndex == MA1_LIMB_TORSO) {
@@ -551,7 +530,7 @@ void EnMaYts_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
} else if (limbIndex == MA1_LIMB_HAND_LEFT) {
if (this->hasBow == true) {
OPEN_DISPS(globalCtx->state.gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, D_060003B0);
gSPDisplayList(POLY_OPA_DISP++, object_ma1_DL_0003B0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
@@ -578,7 +557,7 @@ void EnMaYts_DrawSleeping(Actor* thisx, GlobalContext* globalCtx) {
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_060043A0);
gSPDisplayList(POLY_OPA_DISP++, object_ma1_DL_0043A0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c
+12 -15
View File
@@ -5,6 +5,8 @@
*/
#include "z_en_minifrog.h"
#include "objects/object_fr/object_fr.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000019
@@ -24,12 +26,6 @@ void EnMinifrog_UpdateMissingFrog(Actor* thisx, GlobalContext* globalCtx);
void EnMinifrog_YellowFrogDialog(EnMinifrog* this, GlobalContext* globalCtx);
void EnMinifrog_SetupYellowFrogDialog(EnMinifrog* this, GlobalContext* globalCtx);
extern AnimationHeader D_060007BC;
extern AnimationHeader D_06001534;
extern FlexSkeletonHeader D_0600B538;
extern UNK_TYPE4 D_060059A0;
extern UNK_TYPE4 D_06005BA0;
const ActorInit En_Minifrog_InitVars = {
ACTOR_EN_MINIFROG,
ACTORCAT_NPC,
@@ -65,9 +61,9 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit sColChkInfoInit = { 1, 12, 14, MASS_IMMOVABLE };
// sEyeTextures???
static UNK_TYPE4* D_808A4D74[] = {
&D_060059A0,
&D_06005BA0,
static TexturePtr D_808A4D74[] = {
object_fr_Tex_0059A0,
object_fr_Tex_005BA0,
};
// gSaveContext.weekEventReg[KEY] = VALUE
@@ -92,7 +88,8 @@ void EnMinifrog_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 15.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600B538, &D_06001534, this->jointTable, this->morphTable, 24);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_fr_Skel_00B538, &object_fr_Anim_001534, this->jointTable,
this->morphTable, 24);
CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
@@ -180,7 +177,7 @@ EnMinifrog* EnMinifrog_GetFrog(GlobalContext* globalCtx) {
void EnMinifrog_SetJumpState(EnMinifrog* this) {
if (this->jumpState == MINIFROG_STATE_GROUND) {
this->jumpState = MINIFROG_STATE_JUMP;
Animation_Change(&this->skelAnime, &D_060007BC, 1.0f, 0.0f, 7.0f, 2, -5.0f);
Animation_Change(&this->skelAnime, &object_fr_Anim_0007BC, 1.0f, 0.0f, 7.0f, 2, -5.0f);
}
}
@@ -207,7 +204,7 @@ void EnMinifrog_Jump(EnMinifrog* this) {
case MINIFROG_STATE_AIR:
if (this->actor.bgCheckFlags & 1) {
this->jumpState = MINIFROG_STATE_GROUND;
Animation_MorphToLoop(&this->skelAnime, &D_06001534, -2.5f);
Animation_MorphToLoop(&this->skelAnime, &object_fr_Anim_001534, -2.5f);
SkelAnime_Update(&this->skelAnime);
}
break;
@@ -413,7 +410,7 @@ void EnMinifrog_NextFrogReturned(EnMinifrog* this, GlobalContext* globalCtx) {
this->actionFunc = EnMinifrog_ContinueChoirCutscene;
this->flags &= ~(0x2 << MINIFROG_YELLOW | 0x2 << MINIFROG_CYAN | 0x2 << MINIFROG_PINK | 0x2 << MINIFROG_BLUE |
0x2 << MINIFROG_WHITE);
globalCtx->setPlayerTalkAnim(globalCtx, &D_0400DEA8, 0);
globalCtx->setPlayerTalkAnim(globalCtx, &gameplay_keep_Linkanim_00DEA8, 0);
}
}
@@ -444,7 +441,7 @@ void EnMinifrog_SetupNextFrogChoir(EnMinifrog* this, GlobalContext* globalCtx) {
this->flags &= ~0x100;
this->flags &= ~(0x2 << MINIFROG_YELLOW | 0x2 << MINIFROG_CYAN | 0x2 << MINIFROG_PINK | 0x2 << MINIFROG_BLUE |
0x2 << MINIFROG_WHITE);
globalCtx->setPlayerTalkAnim(globalCtx, &D_0400DEA8, 0);
globalCtx->setPlayerTalkAnim(globalCtx, &gameplay_keep_Linkanim_00DEA8, 0);
} else if (this->timer <= 0) {
this->actionFunc = EnMinifrog_NextFrogReturned;
this->timer = 30;
@@ -464,7 +461,7 @@ void EnMinifrog_BeginChoirCutscene(EnMinifrog* this, GlobalContext* globalCtx) {
this->timer = 5;
func_801A1F00(3, NA_BGM_FROG_SONG);
this->flags |= 0x100;
globalCtx->setPlayerTalkAnim(globalCtx, &D_0400E2A8, 0);
globalCtx->setPlayerTalkAnim(globalCtx, &gameplay_keep_Linkanim_00E2A8, 0);
} else {
ActorCutscene_SetIntentToPlay(this->actor.cutscene);
}
src/overlays/actors/ovl_En_Mm/z_en_mm.c
+2 -1
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_mm.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000010
@@ -216,6 +217,6 @@ void EnMm_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateY(-rotY, MTXMODE_APPLY);
}
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, &D_04055628);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_055628);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

Some files were not shown because too many files have changed in this diff Show More