mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-09 13:45:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Object names rename/comments from the OoT equivalent (#1282)

Browse Source 
* object_fu(Bean Seller)

* object_bombf (Bomb flower)

* object_ds2 (Potion Shop Guy)

* object_fu (guruguru)

* object_hata (Red Flag on Post)

* object_lightswitch (Sun Switch)

* object_rr (Like Like)

* Tower Collapse Bars?

* object_vm (Beamos)

* ups

* object_fu EnumName

* improvements

* Offset

* improvements

* object_ms enums and outnames

* missing prefix

* improvements

* improvements
This commit is contained in:
Nuss
2023-07-03 22:08:30 +02:00
committed by GitHub
parent 5fd8afd1db
commit 3b1b054e93
15 changed files with 231 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
+3 -3
View File
@@ -477,8 +477,8 @@ void EnBombf_Draw(Actor* thisx, PlayState* play) {
if (ENBOMBF_GET(&this->actor) != ENBOMBF_0) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_bombf_DL_000340);
gSPDisplayList(POLY_OPA_DISP++, object_bombf_DL_000530);
gSPDisplayList(POLY_OPA_DISP++, gBombFlowerLeavesDL);
gSPDisplayList(POLY_OPA_DISP++, gBombFlowerBaseLeavesDL);
Matrix_Translate(0.0f, 1000.0f, 0.0f, MTXMODE_APPLY);
Matrix_Scale(this->unk_204, this->unk_204, this->unk_204, MTXMODE_APPLY);
@@ -495,7 +495,7 @@ void EnBombf_Draw(Actor* thisx, PlayState* play) {
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gfx));
}
gSPDisplayList(POLY_OPA_DISP++, object_bombf_DL_000408);
gSPDisplayList(POLY_OPA_DISP++, gBombFlowerBombAndSparkDL);
} else {
Collider_UpdateSpheres(0, &this->colliderJntSph);
}
src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c
+4 -4
View File
@@ -62,18 +62,18 @@ static ColliderCylinderInit sCylinderInit = {
{ 15, 20, 0, { 0, 0, 0 } },
};
static AnimationHeader* sAnimations[] = { &object_fu_Anim_000B04, &object_fu_Anim_00057C };
static AnimationHeader* sAnimations[] = { &gGuruGuruPlayStillAnim, &gGuruGuruPlayAndMoveHeadAnim };
static u8 sAnimationModes[] = { ANIMMODE_LOOP, ANIMMODE_LOOP };
static f32 sPlaySpeeds[] = { 1.0f, 1.0f };
static TexturePtr sEyeTextures[] = { object_fu_Tex_005F20, object_fu_Tex_006320 };
static TexturePtr sMouthTextures[] = { object_fu_Tex_006720, object_fu_Tex_006920 };
static TexturePtr sEyeTextures[] = { gGuruGuruEyeClosedTex, gGuruGuruEyeAngryTex };
static TexturePtr sMouthTextures[] = { gGuruGuruMouthOpenTex, gGuruGuruMouthAngryTex };
void EnGuruguru_Init(Actor* thisx, PlayState* play) {
EnGuruguru* this = THIS;
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 19.0f);
SkelAnime_InitFlex(play, &this->skelAnime, &object_fu_Skel_006C90, &object_fu_Anim_000B04, this->jointTable,
SkelAnime_InitFlex(play, &this->skelAnime, &gGuruGuruSkel, &gGuruGuruPlayStillAnim, this->jointTable,
this->morphTable, 16);
this->actor.targetMode = 0;
if (this->actor.params != 2) {
src/overlays/actors/ovl_En_Hata/z_en_hata.c
+5 -6
View File
@@ -33,13 +33,12 @@ void EnHata_Init(Actor* thisx, PlayState* play) {
s32 rand;
f32 endFrame;
SkelAnime_Init(play, &this->skelAnime, &object_hata_Skel_002FD0, NULL, this->jointTable, this->morphTable,
OBJECT_HATA_LIMB_MAX);
endFrame = Animation_GetLastFrame(&object_hata_Anim_000444);
Animation_Change(&this->skelAnime, &object_hata_Anim_000444, 1.0f, 0.0f, endFrame, ANIMMODE_LOOP, 0.0f);
SkelAnime_Init(play, &this->skelAnime, &gFlagpoleSkel, NULL, this->jointTable, this->morphTable, FLAGPOLE_LIMB_MAX);
endFrame = Animation_GetLastFrame(&gFlagpoleFlapAnim);
Animation_Change(&this->skelAnime, &gFlagpoleFlapAnim, 1.0f, 0.0f, endFrame, ANIMMODE_LOOP, 0.0f);
rand = Rand_ZeroFloat(endFrame);
this->skelAnime.curFrame = rand;
DynaPolyActor_LoadMesh(play, &this->dyna, &object_hata_Colheader_0000C0);
DynaPolyActor_LoadMesh(play, &this->dyna, &gFlagpoleCol);
Actor_SetScale(&this->dyna.actor, 0.013f);
this->dyna.actor.uncullZoneScale = 500.0f;
this->dyna.actor.uncullZoneDownward = 500.0f;
@@ -84,7 +83,7 @@ void EnHata_Update(Actor* thisx, PlayState* play2) {
s32 EnHata_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
EnHata* this = THIS;
if ((limbIndex == OBJECT_HATA_LIMB_04) || (limbIndex == OBJECT_HATA_LIMB_0D)) {
if ((limbIndex == FLAGPOLE_LIMB_FLAG1_HOIST_END_BASE) || (limbIndex == FLAGPOLE_LIMB_FLAG2_HOIST_END_BASE)) {
rot->y += this->unk_29C;
rot->z += this->unk_2A0;
}
src/overlays/actors/ovl_En_Hata/z_en_hata.h
+2 -2
View File
@@ -9,8 +9,8 @@ struct EnHata;
typedef struct EnHata {
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ SkelAnime skelAnime;
/* 0x1A0 */ Vec3s jointTable[OBJECT_HATA_LIMB_MAX];
/* 0x21E */ Vec3s morphTable[OBJECT_HATA_LIMB_MAX];
/* 0x1A0 */ Vec3s jointTable[FLAGPOLE_LIMB_MAX];
/* 0x21E */ Vec3s morphTable[FLAGPOLE_LIMB_MAX];
/* 0x29C */ s16 unk_29C;
/* 0x29E */ UNK_TYPE1 pad_29E[2];
/* 0x2A0 */ s16 unk_2A0;
src/overlays/actors/ovl_En_Ms/z_en_ms.c
+1 -1
View File
@@ -61,7 +61,7 @@ void EnMs_Init(Actor* thisx, PlayState* play) {
EnMs* this = THIS;
Actor_ProcessInitChain(thisx, sInitChain);
SkelAnime_InitFlex(play, &this->skelAnime, &object_ms_Skel_003DC0, &object_ms_Anim_0005EC, this->jointTable,
SkelAnime_InitFlex(play, &this->skelAnime, &gBeanSalesmanSkel, &gBeanSalesmanEatingAnim, this->jointTable,
this->morphTable, 9);
Collider_InitCylinder(play, &this->collider);
Collider_SetCylinderType1(play, &this->collider, &this->actor, &sCylinderInit);
src/overlays/actors/ovl_En_Rr/z_en_rr.c
+1 -1
View File
@@ -936,7 +936,7 @@ void EnRr_Draw(Actor* thisx, PlayState* play2) {
this->collider2.dim.pos.y = ((this->unk_228.y - spA4.y) * 0.85f) + spA4.y;
this->collider2.dim.pos.z = ((this->unk_228.z - spA4.z) * 0.85f) + spA4.z;
gSPDisplayList(POLY_OPA_DISP++, object_rr_DL_000470);
gSPDisplayList(POLY_OPA_DISP++, gLikeLikeDL);
Actor_DrawDamageEffects(play, &this->actor, this->limbPos, ARRAY_COUNT(this->limbPos),
this->actor.scale.y * 66.66667f * this->drawDmgEffScale, this->drawDmgEffFrozenSteamScale,
src/overlays/actors/ovl_En_Vm/z_en_vm.c
+14 -15
View File
@@ -167,8 +167,7 @@ void EnVm_Init(Actor* thisx, PlayState* play) {
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 35.0f);
SkelAnime_Init(play, &this->skelAnime, &object_vm_Skel_003F60, &object_vm_Anim_000068, this->jointTable,
this->morphTable, 11);
SkelAnime_Init(play, &this->skelAnime, &gBeamosSkel, &gBeamosAnim, this->jointTable, this->morphTable, 11);
Collider_InitAndSetTris(play, &this->colliderTris, &this->actor, &sTrisInit, this->colliderTrisElements);
Collider_InitAndSetJntSph(play, &this->colliderJntSph, &this->actor, &sJntSphInit, this->colliderJntSphElements);
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
@@ -199,9 +198,9 @@ void EnVm_Destroy(Actor* thisx, PlayState* play) {
}
void func_808CC420(EnVm* this) {
f32 lastFrame = Animation_GetLastFrame(&object_vm_Anim_000068);
f32 lastFrame = Animation_GetLastFrame(&gBeamosAnim);
Animation_Change(&this->skelAnime, &object_vm_Anim_000068, 1.0f, lastFrame, lastFrame, ANIMMODE_ONCE, 0.0f);
Animation_Change(&this->skelAnime, &gBeamosAnim, 1.0f, lastFrame, lastFrame, ANIMMODE_ONCE, 0.0f);
this->actionFunc = func_808CC490;
}
@@ -231,7 +230,7 @@ void func_808CC490(EnVm* this, PlayState* play) {
}
void func_808CC5C4(EnVm* this) {
Animation_PlayLoopSetSpeed(&this->skelAnime, &object_vm_Anim_000068, 2.0f);
Animation_PlayLoopSetSpeed(&this->skelAnime, &gBeamosAnim, 2.0f);
this->unk_214 = 10;
this->actionFunc = func_808CC610;
}
@@ -266,7 +265,7 @@ void func_808CC610(EnVm* this, PlayState* play) {
void func_808CC788(EnVm* this) {
Actor_PlaySfx(&this->actor, NA_SE_EN_BIMOS_AIM);
Animation_Change(&this->skelAnime, &object_vm_Anim_000068, 3.0f, 3.0f, 7.0f, ANIMMODE_ONCE, 0.0f);
Animation_Change(&this->skelAnime, &gBeamosAnim, 3.0f, 3.0f, 7.0f, ANIMMODE_ONCE, 0.0f);
this->unk_214 = 305;
this->unk_220 = 0.06f;
this->colliderTris.base.atFlags &= ~AT_HIT;
@@ -322,8 +321,8 @@ void func_808CC820(EnVm* this, PlayState* play) {
}
void func_808CCA10(EnVm* this) {
Animation_Change(&this->skelAnime, &object_vm_Anim_000068, -1.0f, Animation_GetLastFrame(&object_vm_Anim_000068),
0.0f, ANIMMODE_ONCE, 0.0f);
Animation_Change(&this->skelAnime, &gBeamosAnim, -1.0f, Animation_GetLastFrame(&gBeamosAnim), 0.0f, ANIMMODE_ONCE,
0.0f);
this->unk_214 = 100;
this->unk_210 = 0;
this->unk_224 = 0.0f;
@@ -343,7 +342,7 @@ void func_808CCAA4(EnVm* this, PlayState* play) {
}
void func_808CCB08(EnVm* this) {
Animation_PlayOnce(&this->skelAnime, &object_vm_Anim_000068);
Animation_PlayOnce(&this->skelAnime, &gBeamosAnim);
this->unk_214 = -1;
this->actionFunc = func_808CCB50;
}
@@ -365,8 +364,8 @@ void func_808CCB50(EnVm* this, PlayState* play) {
}
void func_808CCBE4(EnVm* this, PlayState* play) {
Animation_Change(&this->skelAnime, &object_vm_Anim_000068, -1.0f, Animation_GetLastFrame(&object_vm_Anim_000068),
0.0f, ANIMMODE_ONCE, 0.0f);
Animation_Change(&this->skelAnime, &gBeamosAnim, -1.0f, Animation_GetLastFrame(&gBeamosAnim), 0.0f, ANIMMODE_ONCE,
0.0f);
Enemy_StartFinishingBlow(play, &this->actor);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 33);
this->unk_214 = 33;
@@ -462,10 +461,10 @@ void EnVm_Update(Actor* thisx, PlayState* play) {
s32 EnVm_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
EnVm* this = THIS;
if (limbIndex == OBJECT_VM_LIMB_02) {
if (limbIndex == BEAMOS_LIMB_HEAD_ROOT) {
rot->x += this->unk_216;
rot->y += this->unk_218;
} else if ((limbIndex == OBJECT_VM_LIMB_0A) && (this->actionFunc == func_808CCCF0)) {
} else if ((limbIndex == BEAMOS_LIMB_BODY) && (this->actionFunc == func_808CCCF0)) {
*dList = NULL;
}
return false;
@@ -481,7 +480,7 @@ void EnVm_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
Collider_UpdateSpheres(limbIndex, &this->colliderJntSph);
if (limbIndex == OBJECT_VM_LIMB_02) {
if (limbIndex == BEAMOS_LIMB_HEAD_ROOT) {
sp4C = NULL;
Matrix_MultZero(&this->actor.focus.pos);
@@ -549,7 +548,7 @@ void EnVm_Draw(Actor* thisx, PlayState* play) {
Matrix_Scale(this->unk_220, this->unk_220, this->unk_224 * 0.0015f, MTXMODE_APPLY);
gSPMatrix(&gfx[1], Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(&gfx[2], object_vm_DL_002728);
gSPDisplayList(&gfx[2], gBeamosLaserDL);
POLY_OPA_DISP = &gfx[3];
}