From dce6b8b342853d1f06dbd5c61678d3db51cd7f3e Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Wed, 8 Jan 2025 03:43:34 -0300 Subject: [PATCH] OBJ_ACTOR_MA_TENDER -> OBJ_ACTOR_MA_TENDER_CAR --- assets/yaml/us/rev1/ast_macbeth.yaml | 12 ++++++------ include/i5.h | 2 +- include/sf64object.h | 4 ++-- src/engine/fox_edata_info.c | 2 +- src/engine/fox_enmy.c | 2 +- src/overlays/ovl_i5/fox_ma.c | 14 +++++++------- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/assets/yaml/us/rev1/ast_macbeth.yaml b/assets/yaml/us/rev1/ast_macbeth.yaml index 3dee38f1..9f02dda7 100644 --- a/assets/yaml/us/rev1/ast_macbeth.yaml +++ b/assets/yaml/us/rev1/ast_macbeth.yaml @@ -487,11 +487,11 @@ D_MA_601D188: D_MA_601EA28: {type: SF64:ANIM, offset: 0x601EA28, symbol: D_MA_601EA28} -aMaTenderAnim: - {type: SF64:ANIM, offset: 0x601EAB0, symbol: aMaTenderAnim} +aMaTenderCarAnim: + {type: SF64:ANIM, offset: 0x601EAB0, symbol: aMaTenderCarAnim} -aMaTenderSkel: - {type: SF64:SKELETON, offset: 0x601EBBC, symbol: aMaTenderSkel} +aMaTenderCarSkel: + {type: SF64:SKELETON, offset: 0x601EBBC, symbol: aMaTenderCarSkel} aMaWall2DL: {type: GFX, offset: 0x601F1D0, symbol: aMaWall2DL} @@ -763,8 +763,8 @@ aMaLocomotiveHitbox: aMaMissileCarHitbox: {type: SF64:HITBOX, offset: 0x6035A14, symbol: aMaMissileCarHitbox} -aMaTenderHitbox: - {type: SF64:HITBOX, offset: 0x6035A48, symbol: aMaTenderHitbox} +aMaTenderCarHitbox: + {type: SF64:HITBOX, offset: 0x6035A48, symbol: aMaTenderCarHitbox} D_MA_6035A94: {type: SF64:HITBOX, offset: 0x6035A94, symbol: D_MA_6035A94} diff --git a/include/i5.h b/include/i5.h index 1faca58e..f712023d 100644 --- a/include/i5.h +++ b/include/i5.h @@ -119,7 +119,7 @@ void Macbeth_MaFallingBoulder_Update(Actor*); void Macbeth_MaFallingBoulder_Draw(Actor*); void Macbeth_MaMechbeth_Update(Actor*); void Macbeth_MaMechbeth_Draw(Actor*); -void Macbeth_MaTender_Update(Actor*); +void Macbeth_MaTenderCar_Update(Actor*); void Macbeth_MaBombDrop_Update(Actor*); void Macbeth_MaBombDrop_Draw(Actor*); void Macbeth_MaSpear_Update(Actor*); diff --git a/include/sf64object.h b/include/sf64object.h index 1ccc7509..e087ca0f 100644 --- a/include/sf64object.h +++ b/include/sf64object.h @@ -522,7 +522,7 @@ typedef enum ObjectId { /* 203 */ OBJ_ACTOR_SX_SLIPPY, /* 204 */ OBJ_ACTOR_SY_ROBOT, /* 205 */ OBJ_ACTOR_MA_LOCOMOTIVE, // Macbeth train locomotive. - /* 206 */ OBJ_ACTOR_MA_TENDER, // Macbeth train tender, where Mechbeth is hidden. + /* 206 */ OBJ_ACTOR_MA_TENDER_CAR, // Macbeth train tender, where Mechbeth is hidden. /* 207 */ OBJ_ACTOR_MA_MECHBETH, // Macbeth train BOSS, located inside the tender. /* 208 */ OBJ_ACTOR_MA_MISSILE_CAR, // Macbeth train Copperhead Missile container car. /* 209 */ OBJ_ACTOR_MA_ROBOT, // Macbeth train Robot. @@ -1182,7 +1182,7 @@ typedef Actor MeHopBot; typedef Actor SxSlippy; typedef Actor SyRobot; typedef Actor MaLocomotive; -typedef Actor MaTender; +typedef Actor MaTenderCar; typedef Actor MaMechbeth; typedef Actor MaMissileCar; typedef Actor MaRobot; diff --git a/src/engine/fox_edata_info.c b/src/engine/fox_edata_info.c index f43ae928..d5e3471a 100644 --- a/src/engine/fox_edata_info.c +++ b/src/engine/fox_edata_info.c @@ -322,7 +322,7 @@ ObjectInfo gObjectInfo[] = { /* OBJ_ACTOR_SX_SLIPPY */ {(void*) SectorX_SxSlippy_Draw, 1, (ObjectFunc) SectorX_SxSlippy_Update, gNoHitbox, 1000.0f, 0, 0, 39, 0, 0.0f, 0 }, /* OBJ_ACTOR_SY_ROBOT */ {(void*) SectorY_SyRobot_Draw, 1, (ObjectFunc) SectorY_SyRobot_Update, aSyRobotHitbox, 1000.0f, 0, 0, 39, 0, 1.0f, 1 }, /* OBJ_ACTOR_MA_LOCOMOTIVE */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaLocomotive_Update, aMaLocomotiveHitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_MA_TENDER */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTender_Update, aMaTenderHitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_MA_TENDER_CAR */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTenderCar_Update, aMaTenderCarHitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, /* OBJ_ACTOR_MA_MECHBETH */ {(void*) Macbeth_MaMechbeth_Draw, 2, (ObjectFunc) Macbeth_MaMechbeth_Update, aMaMechbethHitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, /* OBJ_ACTOR_MA_MISSILE_CAR */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaMissileCar_Update, aMaMissileCarHitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, /* OBJ_ACTOR_MA_ROBOT */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaRobot_Update, aMaRobotHitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, diff --git a/src/engine/fox_enmy.c b/src/engine/fox_enmy.c index 2db26172..b855341d 100644 --- a/src/engine/fox_enmy.c +++ b/src/engine/fox_enmy.c @@ -1255,7 +1255,7 @@ void Object_Init(s32 index, ObjectId objId) { SectorY_SyShogun_Init(&gBosses[index]); break; case OBJ_ACTOR_MA_LOCOMOTIVE: - case OBJ_ACTOR_MA_TENDER: + case OBJ_ACTOR_MA_TENDER_CAR: case OBJ_ACTOR_MA_MISSILE_CAR: case OBJ_ACTOR_MA_ROBOT: case OBJ_ACTOR_MA_BOULDER_CAR: diff --git a/src/overlays/ovl_i5/fox_ma.c b/src/overlays/ovl_i5/fox_ma.c index 353ed609..ba5d0f0a 100644 --- a/src/overlays/ovl_i5/fox_ma.c +++ b/src/overlays/ovl_i5/fox_ma.c @@ -35,7 +35,7 @@ void Macbeth_8019D048(Actor*); void Macbeth_8019FC54(Actor*, s32*, s32*, s32, s32, f32, f32, s32*); void Macbeth_MaBoulder_Spawn(f32, f32, f32, f32, f32, f32, f32, s32, u8); void Macbeth_8019D910(Actor*, s32*, s32*, s32, f32, f32, s32*, s32*); -bool Macbeth_MaTender_OverrideLimbDraw(s32, Gfx**, Vec3f*, Vec3f*, void*); +bool Macbeth_MaTenderCar_OverrideLimbDraw(s32, Gfx**, Vec3f*, Vec3f*, void*); void Macbeth_MaBoulder_HandleDamage(Actor*); void Macbeth_MaBombDrop_Spawn(f32, f32, f32, f32, f32, f32); void Macbeth_MaSpear_Spawn(f32, f32, f32, f32, f32, f32, s16); @@ -2350,7 +2350,7 @@ void Macbeth_Train_Draw(Actor* this) { Matrix_RotateX(gGfxMatrix, this->fwork[29] * M_DTOR, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); - if ((this->obj.id != OBJ_ACTOR_MA_TENDER) && (this->obj.id != OBJ_ACTOR_MA_LOCOMOTIVE)) { + if ((this->obj.id != OBJ_ACTOR_MA_TENDER_CAR) && (this->obj.id != OBJ_ACTOR_MA_LOCOMOTIVE)) { if (((gPlayer[0].trueZpos - this->obj.pos.z) > 3000.0f) && (D_i5_801BE310 != this->iwork[5])) { gSPDisplayList(gMasterDisp++, D_MA_6027BF0); gSPDisplayList(gMasterDisp++, D_MA_601BE90); @@ -2481,9 +2481,9 @@ void Macbeth_Train_Draw(Actor* this) { } break; - case OBJ_ACTOR_MA_TENDER: - Animation_GetFrameData(&aMaTenderAnim, 0, frameTable); - Animation_DrawSkeleton(1, aMaTenderSkel, frameTable, Macbeth_MaTender_OverrideLimbDraw, NULL, this, + case OBJ_ACTOR_MA_TENDER_CAR: + Animation_GetFrameData(&aMaTenderCarAnim, 0, frameTable); + Animation_DrawSkeleton(1, aMaTenderCarSkel, frameTable, Macbeth_MaTenderCar_OverrideLimbDraw, NULL, this, &gIdentityMatrix); break; @@ -5458,7 +5458,7 @@ void Macbeth_MaMechbeth_Draw(MaMechbeth* this) { void Macbeth_801AC42C(s32 arg0) { } -void Macbeth_MaTender_Update(MaTender* this) { +void Macbeth_MaTenderCar_Update(MaTenderCar* this) { switch (this->state) { case 0: Macbeth_TrainCarSpeed_Update(this); @@ -5487,7 +5487,7 @@ void Macbeth_MaTender_Update(MaTender* this) { } } -bool Macbeth_MaTender_OverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { +bool Macbeth_MaTenderCar_OverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { RCP_SetupDL(&gMasterDisp, SETUPDL_29); gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN);