diff --git a/assets/xml/objects/object_fr.xml b/assets/xml/objects/object_fr.xml index f7fa4354b8..3262c67829 100644 --- a/assets/xml/objects/object_fr.xml +++ b/assets/xml/objects/object_fr.xml @@ -1,67 +1,68 @@  + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/overlays/actors/ovl_En_Fg/z_en_fg.c b/src/overlays/actors/ovl_En_Fg/z_en_fg.c index 3fecf18617..d1da1ef8d0 100644 --- a/src/overlays/actors/ovl_En_Fg/z_en_fg.c +++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.c @@ -105,18 +105,18 @@ static DamageTable sDamageTable = { typedef enum { /* -1 */ BETAFROG_ANIM_NONE = -1, - /* 0 */ BETAFROG_ANIM_0, - /* 1 */ BETAFROG_ANIM_1, - /* 2 */ BETAFROG_ANIM_2, - /* 3 */ BETAFROG_ANIM_3, + /* 0 */ BETAFROG_ANIM_IDLE, + /* 1 */ BETAFROG_ANIM_IDLE_MORPH, + /* 2 */ BETAFROG_ANIM_DANCE, + /* 3 */ BETAFROG_ANIM_JUMP, /* 4 */ BETAFROG_ANIM_MAX } BetaFrogAnimation; static AnimationInfoS sAnimationInfo[BETAFROG_ANIM_MAX] = { - { &object_fr_Anim_001534, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // BETAFROG_ANIM_0 - { &object_fr_Anim_001534, 1.0f, 0, -1, ANIMMODE_LOOP, -4 }, // BETAFROG_ANIM_1 - { &object_fr_Anim_0011C0, 1.0f, 0, -1, ANIMMODE_LOOP, -4 }, // BETAFROG_ANIM_2 - { &object_fr_Anim_0007BC, 1.0f, 0, -1, ANIMMODE_ONCE, -4 }, // BETAFROG_ANIM_3 + { &gFrogIdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // BETAFROG_ANIM_IDLE + { &gFrogIdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -4 }, // BETAFROG_ANIM_IDLE_MORPH + { &gFrogDanceAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -4 }, // BETAFROG_ANIM_DANCE + { &gFrogJumpAnim, 1.0f, 0, -1, ANIMMODE_ONCE, -4 }, // BETAFROG_ANIM_JUMP }; s32 EnFg_ChangeAnim(SkelAnime* skelAnime, s16 animIndex) { @@ -244,7 +244,7 @@ void EnFg_Idle(EnFg* this, PlayState* play) { default: if (DECR(this->timer) == 0) { Actor_PlaySfx(&this->actor, NA_SE_EV_FROG_JUMP); - EnFg_ChangeAnim(&this->skelAnime, BETAFROG_ANIM_3); + EnFg_ChangeAnim(&this->skelAnime, BETAFROG_ANIM_JUMP); this->actor.velocity.y = 10.0f; this->timer = Rand_S16Offset(30, 30); this->actionFunc = EnFg_Jump; @@ -281,7 +281,7 @@ void EnFg_Jump(EnFg* this, PlayState* play) { case BETAFROG_DMGEFFECT_EXPLOSION: this->actor.flags &= ~ACTOR_FLAG_1; Actor_PlaySfx(&this->actor, NA_SE_EV_FROG_CRY_0); - EnFg_ChangeAnim(&this->skelAnime, BETAFROG_ANIM_0); + EnFg_ChangeAnim(&this->skelAnime, BETAFROG_ANIM_IDLE); this->actor.params = BETAFROG_BLACK; this->skelAnime.playSpeed = 0.0f; ac = this->collider.base.ac; @@ -302,7 +302,7 @@ void EnFg_Jump(EnFg* this, PlayState* play) { } if ((this->actor.velocity.y <= 0.0f) && (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) { - EnFg_ChangeAnim(&this->skelAnime, BETAFROG_ANIM_0); + EnFg_ChangeAnim(&this->skelAnime, BETAFROG_ANIM_IDLE); this->actionFunc = EnFg_Idle; this->actor.velocity.y = 0.0f; } else { @@ -341,9 +341,8 @@ void EnFg_Init(Actor* thisx, PlayState* play) { EnFg* this = THIS; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 10.0f); - SkelAnime_InitFlex(play, &this->skelAnime, &object_fr_Skel_00B538, NULL, this->jointTable, this->morphTable, - OBJECT_FR_LIMB_MAX); - EnFg_ChangeAnim(&this->skelAnime, BETAFROG_ANIM_0); + SkelAnime_InitFlex(play, &this->skelAnime, &gFrogSkel, NULL, this->jointTable, this->morphTable, FROG_LIMB_MAX); + EnFg_ChangeAnim(&this->skelAnime, BETAFROG_ANIM_IDLE); Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit2); @@ -385,12 +384,12 @@ void EnFg_Update(Actor* thisx, PlayState* play) { s32 EnFg_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { EnFg* this = THIS; - if ((limbIndex == OBJECT_FR_LIMB_07) || (limbIndex == OBJECT_FR_LIMB_08)) { + if ((limbIndex == FROG_LIMB_RIGHT_EYE) || (limbIndex == FROG_LIMB_LEFT_EYE)) { *dList = NULL; } if (this->actor.colChkInfo.health == 0) { - if ((limbIndex == OBJECT_FR_LIMB_05) || (limbIndex == OBJECT_FR_LIMB_09)) { + if ((limbIndex == FROG_LIMB_RIGHT_IRIS) || (limbIndex == FROG_LIMB_LEFT_IRIS)) { *dList = NULL; } } @@ -402,7 +401,7 @@ void EnFg_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, s16 pad; Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; - if ((limbIndex == OBJECT_FR_LIMB_07) || (limbIndex == OBJECT_FR_LIMB_08)) { + if ((limbIndex == FROG_LIMB_RIGHT_EYE) || (limbIndex == FROG_LIMB_LEFT_EYE)) { OPEN_DISPS(play->state.gfxCtx); Matrix_Push(); @@ -414,7 +413,7 @@ void EnFg_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, CLOSE_DISPS(play->state.gfxCtx); } - if (limbIndex == OBJECT_FR_LIMB_04) { + if (limbIndex == FROG_LIMB_HEAD) { Matrix_MultVec3f(&zeroVec, &this->actor.focus.pos); } } @@ -441,8 +440,8 @@ void EnFg_Draw(Actor* thisx, PlayState* play) { 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(object_fr_Tex_0059A0)); - gSPSegment(POLY_OPA_DISP++, 0x09, Lib_SegmentedToVirtual(object_fr_Tex_0059A0)); + gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gFrogIrisOpenTex)); + gSPSegment(POLY_OPA_DISP++, 0x09, Lib_SegmentedToVirtual(gFrogIrisOpenTex)); SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnFg_OverrideLimbDraw, EnFg_PostLimbDraw, &this->actor); @@ -501,7 +500,7 @@ void EnFg_DrawDust(PlayState* play, BetaFrogEffectDust* dustEffect) { if (!firstDone) { POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_0); - gSPDisplayList(POLY_XLU_DISP++, object_fr_DL_00B328); + gSPDisplayList(POLY_XLU_DISP++, gFrogDustMaterialDL); gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, 0); firstDone = true; } @@ -515,7 +514,7 @@ void EnFg_DrawDust(PlayState* play, BetaFrogEffectDust* dustEffect) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); index = 0.5f * dustEffect->timer; gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(sDustTextures[index])); - gSPDisplayList(POLY_XLU_DISP++, object_fr_DL_00B338); + gSPDisplayList(POLY_XLU_DISP++, gFrogDustModelDL); } CLOSE_DISPS(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_En_Fg/z_en_fg.h b/src/overlays/actors/ovl_En_Fg/z_en_fg.h index 4f4f84fe0a..42d4936eea 100644 --- a/src/overlays/actors/ovl_En_Fg/z_en_fg.h +++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.h @@ -34,8 +34,8 @@ typedef struct EnFg { /* 0x144 */ EnFgActionFunc actionFunc; /* 0x148 */ SkelAnime skelAnime; /* 0x18C */ ColliderCylinder collider; - /* 0x1D8 */ Vec3s jointTable[OBJECT_FR_LIMB_MAX]; - /* 0x268 */ Vec3s morphTable[OBJECT_FR_LIMB_MAX]; + /* 0x1D8 */ Vec3s jointTable[FROG_LIMB_MAX]; + /* 0x268 */ Vec3s morphTable[FROG_LIMB_MAX]; /* 0x2F8 */ s16 timer; /* 0x2FA */ s16 bounceCounter; /* 0x2FC */ BetaFrogEffectDust dustEffect[10]; diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c index e6a80e00bb..3ea137783a 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c @@ -59,10 +59,9 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit sColChkInfoInit = { 1, 12, 14, MASS_IMMOVABLE }; -// sEyeTextures??? -static TexturePtr D_808A4D74[] = { - object_fr_Tex_0059A0, - object_fr_Tex_005BA0, +static TexturePtr sEyeTextures[] = { + gFrogIrisOpenTex, + gFrogIrisClosedTex, }; static u16 sIsFrogReturnedFlags[] = { @@ -85,14 +84,14 @@ void EnMinifrog_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 15.0f); - SkelAnime_InitFlex(play, &this->skelAnime, &object_fr_Skel_00B538, &object_fr_Anim_001534, this->jointTable, - this->morphTable, OBJECT_FR_LIMB_MAX); + SkelAnime_InitFlex(play, &this->skelAnime, &gFrogSkel, &gFrogIdleAnim, this->jointTable, this->morphTable, + FROG_LIMB_MAX); CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sColChkInfoInit); Collider_InitAndSetCylinder(play, &this->collider, &this->actor, &sCylinderInit); if (!sIsInitialized) { - for (i = 0; i < ARRAY_COUNT(D_808A4D74); i++) { - D_808A4D74[i] = Lib_SegmentedToVirtual(D_808A4D74[i]); + for (i = 0; i < ARRAY_COUNT(sEyeTextures); i++) { + sEyeTextures[i] = Lib_SegmentedToVirtual(sEyeTextures[i]); } sIsInitialized = true; } @@ -172,7 +171,7 @@ EnMinifrog* EnMinifrog_GetFrog(PlayState* play) { void EnMinifrog_SetJumpState(EnMinifrog* this) { if (this->jumpState == FROG_STATE_GROUND) { this->jumpState = FROG_STATE_JUMP; - Animation_Change(&this->skelAnime, &object_fr_Anim_0007BC, 1.0f, 0.0f, 7.0f, ANIMMODE_ONCE, -5.0f); + Animation_Change(&this->skelAnime, &gFrogJumpAnim, 1.0f, 0.0f, 7.0f, ANIMMODE_ONCE, -5.0f); } } @@ -200,7 +199,7 @@ void EnMinifrog_Jump(EnMinifrog* this) { case FROG_STATE_AIR: if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { this->jumpState = FROG_STATE_GROUND; - Animation_MorphToLoop(&this->skelAnime, &object_fr_Anim_001534, -2.5f); + Animation_MorphToLoop(&this->skelAnime, &gFrogIdleAnim, -2.5f); SkelAnime_Update(&this->skelAnime); } break; @@ -616,11 +615,11 @@ void EnMinifrog_UpdateMissingFrog(Actor* thisx, PlayState* play) { } s32 EnMinifrog_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { - if (limbIndex == OBJECT_FR_LIMB_01) { + if (limbIndex == FROG_LIMB_LOWER_BODY) { pos->z -= 500.0f; } - if ((limbIndex == OBJECT_FR_LIMB_07) || (limbIndex == OBJECT_FR_LIMB_08)) { + if ((limbIndex == FROG_LIMB_RIGHT_EYE) || (limbIndex == FROG_LIMB_LEFT_EYE)) { *dList = NULL; } @@ -630,7 +629,7 @@ s32 EnMinifrog_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec void EnMinifrog_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) { EnMinifrog* this = THIS; - if ((limbIndex == OBJECT_FR_LIMB_07) || (limbIndex == OBJECT_FR_LIMB_08)) { + if ((limbIndex == FROG_LIMB_RIGHT_EYE) || (limbIndex == FROG_LIMB_LEFT_EYE)) { OPEN_DISPS(play->state.gfxCtx); Matrix_ReplaceRotation(&play->billboardMtxF); @@ -640,7 +639,7 @@ void EnMinifrog_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* CLOSE_DISPS(play->state.gfxCtx); } - if (limbIndex == OBJECT_FR_LIMB_04) { + if (limbIndex == FROG_LIMB_HEAD) { Matrix_MultZero(&this->actor.focus.pos); } } @@ -661,8 +660,8 @@ void EnMinifrog_Draw(Actor* thisx, PlayState* play) { Gfx_SetupDL25_Opa(play->state.gfxCtx); envColor = &sFrogEnvColors[this->frogIndex]; - gSPSegment(POLY_OPA_DISP++, 0x08, D_808A4D74[0]); - gSPSegment(POLY_OPA_DISP++, 0x09, D_808A4D74[0]); + gSPSegment(POLY_OPA_DISP++, 0x08, sEyeTextures[0]); + gSPSegment(POLY_OPA_DISP++, 0x09, sEyeTextures[0]); gDPSetEnvColor(POLY_OPA_DISP++, envColor->r, envColor->g, envColor->b, envColor->a); SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnMinifrog_OverrideLimbDraw, EnMinifrog_PostLimbDraw, &this->actor); diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h index 5f1fd80b53..a2752c830b 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h @@ -28,8 +28,8 @@ typedef enum { typedef struct EnMinifrog { /* 0x000 */ Actor actor; /* 0x144 */ SkelAnime skelAnime; - /* 0x188 */ Vec3s jointTable[OBJECT_FR_LIMB_MAX]; - /* 0x218 */ Vec3s morphTable[OBJECT_FR_LIMB_MAX]; + /* 0x188 */ Vec3s jointTable[FROG_LIMB_MAX]; + /* 0x218 */ Vec3s morphTable[FROG_LIMB_MAX]; /* 0x2A8 */ EnMinifrogActionFunc actionFunc; /* 0x2AC */ struct EnMinifrog* frog; /* 0x2B0 */ s16 frogIndex;