falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change "outer ring" to "minute ring" to better describe what it is

This commit is contained in:
tom-overton 2022-01-02 23:32:00 -08:00
parent ee72865f22
commit 3d27c4b38d
3 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
assets/xml/objects/object_obj_tokeidai.xml
View File

@ -12,21 +12,21 @@
<!-- Clock Tower Clock Face DisplayList -->
<DList Name="gClockTowerClockFace" Offset="0xE818" />
<!-- Clock Tower Exterior Gear Textures (one is also reused for the outer ring) -->
<!-- Clock Tower Exterior Gear Textures (one is also reused for the minute ring) -->
<Texture Name="gClockTowerExteriorGearFaceTex" OutName="clock_tower_exterior_gear_face" Format="rgba16" Width="32" Height="32" Offset="0x2840" />
<Texture Name="gClockTowerExteriorGearSidesAndOuterRingBackTex" OutName="clock_tower_exterior_gear_sides_and_outer_ring_back" Format="rgba16" Width="16" Height="32" Offset="0x3040" />
<Texture Name="gClockTowerExteriorGearSidesAndMinuteRingBackTex" OutName="clock_tower_exterior_gear_sides_and_minute_ring_back" Format="rgba16" Width="16" Height="32" Offset="0x3040" />
<!-- Clock Tower Exterior Gear DisplayList -->
<DList Name="gClockTowerExteriorGearDL" Offset="0xBA78" />
<!-- Clock Tower Outer Ring Textures -->
<Texture Name="gClockTowerOuterRingFace1Tex" OutName="clock_tower_outer_ring_face_1" Format="rgba16" Width="32" Height="16" Offset="0x4240" />
<Texture Name="gClockTowerOuterRingFace2Tex" OutName="clock_tower_outer_ring_face_2" Format="rgba16" Width="32" Height="16" Offset="0x4640" />
<Texture Name="gClockTowerOuterRingFace3Tex" OutName="clock_tower_outer_ring_face_3" Format="rgba16" Width="32" Height="16" Offset="0x4A40" />
<Texture Name="gClockTowerOuterRingSidesTex" OutName="clock_tower_outer_ring_sides" Format="rgba16" Width="32" Height="16" Offset="0x4E40" />
<!-- Clock Tower Minute Ring Textures -->
<Texture Name="gClockTowerMinuteRingFace1Tex" OutName="clock_tower_minute_ring_face_1" Format="rgba16" Width="32" Height="16" Offset="0x4240" />
<Texture Name="gClockTowerMinuteRingFace2Tex" OutName="clock_tower_minute_ring_face_2" Format="rgba16" Width="32" Height="16" Offset="0x4640" />
<Texture Name="gClockTowerMinuteRingFace3Tex" OutName="clock_tower_minute_ring_face_3" Format="rgba16" Width="32" Height="16" Offset="0x4A40" />
<Texture Name="gClockTowerMinuteRingSidesTex" OutName="clock_tower_minute_ring_sides" Format="rgba16" Width="32" Height="16" Offset="0x4E40" />
<!-- Clock Tower Outer Ring DisplayList -->
<DList Name="gClockTowerOuterRingDL" Offset="0xCF28" />
<!-- Clock Tower Minute Ring DisplayList -->
<DList Name="gClockTowerMinuteRingDL" Offset="0xCF28" />
<!-- Clock Tower Sun and Moon Panel Textures -->
<Texture Name="gClockTowerSunAndMoonPanelSidesTex" OutName="clock_tower_sun_and_moon_panel_sides" Format="rgba16" Width="16" Height="16" Offset="0x3A40" />

46
src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c
View File

@ -24,7 +24,7 @@
#define GET_CURRENT_HOUR(this) ((s32)((this)->currentTime * (24.0f / 0x10000)))
#define GET_CURRENT_MINUTE(this) ((s32)((this)->currentTime * (360 * 2.0f / 0x10000)) % 30)
#define GET_CLOCK_FACE_ROTATION(currentHour) ((s16)(currentHour * (0x10000 / 24.0f)))
#define GET_OUTER_RING_OR_GEAR_ROTATION(currentMinute) ((s16)(currentMinute * (0x10000 * 12.0f / 360)))
#define GET_MINUTE_RING_OR_GEAR_ROTATION(currentMinute) ((s16)(currentMinute * (0x10000 * 12.0f / 360)))
void ObjTokeidai_Init(Actor* thisx, GlobalContext* globalCtx);
void ObjTokeidai_Destroy(Actor* thisx, GlobalContext* globalCtx);
@ -82,9 +82,9 @@ void ObjTokeidai_SetupClockOrGear(ObjTokeidai* this) {
s32 currentMinute = GET_CURRENT_MINUTE(this);
this->clockMinute = currentMinute;
this->outerRingOrGearRotation = GET_OUTER_RING_OR_GEAR_ROTATION(currentMinute);
this->outerRingOrGearRotationalVelocity = 0x3C;
this->outerRingOrGearRotationTimer = 0;
this->minuteRingOrGearRotation = GET_MINUTE_RING_OR_GEAR_ROTATION(currentMinute);
this->minuteRingOrGearRotationalVelocity = 0x3C;
this->minuteRingOrGearRotationTimer = 0;
}
void ObjTokeidai_Clock_Init(ObjTokeidai* this) {
@ -260,33 +260,33 @@ void ObjTokeidai_RotateOnMinuteChange(ObjTokeidai* this, s32 playSfx) {
s32 currentMinute = GET_CURRENT_MINUTE(this);
if (currentMinute != this->clockMinute) {
if (this->outerRingOrGearRotationTimer == 8 && playSfx) {
if (this->minuteRingOrGearRotationTimer == 8 && playSfx) {
Audio_PlayActorSound2(&this->actor, NA_SE_EV_CLOCK_TOWER_SECOND_HAND);
}
if (this->outerRingOrGearRotationTimer > 8) {
if (this->minuteRingOrGearRotationTimer > 8) {
// This actually performs the rotation to the next minute
// for the outer ring or gear.
this->outerRingOrGearRotationalVelocity += 0x3C;
this->outerRingOrGearRotation += this->outerRingOrGearRotationalVelocity;
// for the minute ring or gear.
this->minuteRingOrGearRotationalVelocity += 0x3C;
this->minuteRingOrGearRotation += this->minuteRingOrGearRotationalVelocity;
} else {
// This makes the outer ring or gear wiggle in place for a bit
// This makes the minute ring or gear wiggle in place for a bit
// before rotating to the next position.
if ((this->outerRingOrGearRotationTimer & 3) == 0) {
this->outerRingOrGearRotation += 0x5A;
if ((this->minuteRingOrGearRotationTimer & 3) == 0) {
this->minuteRingOrGearRotation += 0x5A;
}
if ((this->outerRingOrGearRotationTimer & 3) == 1) {
this->outerRingOrGearRotation -= 0x5A;
if ((this->minuteRingOrGearRotationTimer & 3) == 1) {
this->minuteRingOrGearRotation -= 0x5A;
}
}
this->outerRingOrGearRotationTimer++;
if ((currentMinute == 15 && this->outerRingOrGearRotation < 0) ||
(currentMinute != 15 && this->outerRingOrGearRotation > GET_OUTER_RING_OR_GEAR_ROTATION(currentMinute))) {
this->outerRingOrGearRotation = GET_OUTER_RING_OR_GEAR_ROTATION(currentMinute);
this->minuteRingOrGearRotationTimer++;
if ((currentMinute == 15 && this->minuteRingOrGearRotation < 0) ||
(currentMinute != 15 && this->minuteRingOrGearRotation > GET_MINUTE_RING_OR_GEAR_ROTATION(currentMinute))) {
this->minuteRingOrGearRotation = GET_MINUTE_RING_OR_GEAR_ROTATION(currentMinute);
this->clockMinute = currentMinute;
this->outerRingOrGearRotationalVelocity = 0x5A;
this->outerRingOrGearRotationTimer = 0;
this->minuteRingOrGearRotationalVelocity = 0x5A;
this->minuteRingOrGearRotationTimer = 0;
}
}
}
@ -781,9 +781,9 @@ void ObjTokeidai_Clock_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_InsertXRotation_s(-this->xRotation, MTXMODE_APPLY);
Matrix_InsertTranslation(0.0f, 0.0f, 1791.0f, MTXMODE_APPLY);
Matrix_StatePush();
Matrix_InsertZRotation_s(-this->outerRingOrGearRotation, MTXMODE_APPLY);
Matrix_InsertZRotation_s(-this->minuteRingOrGearRotation, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gClockTowerOuterRingDL);
gSPDisplayList(POLY_OPA_DISP++, gClockTowerMinuteRingDL);
Matrix_StatePop();
Matrix_InsertTranslation(0.0f, 0.0f, this->clockFaceZTranslation, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -842,7 +842,7 @@ void ObjTokeidai_TowerGear_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_InsertXRotation_s(-this->xRotation, MTXMODE_APPLY);
Matrix_RotateY(thisx->shape.rot.y, MTXMODE_APPLY);
Matrix_InsertTranslation(0.0f, 0.0f, 1791.0f, MTXMODE_APPLY);
Matrix_InsertZRotation_s(this->outerRingOrGearRotation, MTXMODE_APPLY);
Matrix_InsertZRotation_s(this->minuteRingOrGearRotation, MTXMODE_APPLY);
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++, gClockTowerExteriorGearDL);

6
src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h
View File

@ -27,9 +27,9 @@ typedef struct ObjTokeidai {
/* 0x000 */ Actor actor;
/* 0x144 */ Gfx* opaDList;
/* 0x148 */ Gfx* xluDList;
/* 0x14C */ s16 outerRingOrGearRotation;
/* 0x14E */ s16 outerRingOrGearRotationalVelocity;
/* 0x150 */ s16 outerRingOrGearRotationTimer;
/* 0x14C */ s16 minuteRingOrGearRotation;
/* 0x14E */ s16 minuteRingOrGearRotationalVelocity;
/* 0x150 */ s16 minuteRingOrGearRotationTimer;
/* 0x152 */ s16 clockFaceRotation;
/* 0x154 */ union {
s16 clockFaceRotationalVelocity;