diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_parameter.c | 18 | ||||
| -rw-r--r-- | src/code/z_sub_s.c | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index a00341dec..f292f6d90 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -7218,15 +7218,15 @@ void Interface_Init(PlayState* play) { (play->sceneId != SCENE_LAST_GORON) && (play->sceneId != SCENE_LAST_ZORA) && (play->sceneId != SCENE_LAST_LINK)) { - CLEAR_EVENTINF(EVENTINF_53); // Goht intro cutscene watched - CLEAR_EVENTINF(EVENTINF_54); // Odolwa intro cutscene watched - CLEAR_EVENTINF(EVENTINF_55); // Twinmold intro cutscene watched - CLEAR_EVENTINF(EVENTINF_56); // Gyorg intro cutscene watched - CLEAR_EVENTINF(EVENTINF_57); // Igos du Ikana intro cutscene watched - CLEAR_EVENTINF(EVENTINF_60); // Wart intro cutscene watched - CLEAR_EVENTINF(EVENTINF_61); // Majoras intro cutscene watched - CLEAR_EVENTINF(EVENTINF_62); // - CLEAR_EVENTINF(EVENTINF_63); // Gomess intro cutscene watched + CLEAR_EVENTINF(EVENTINF_INTRO_CS_WATCHED_GOHT); + CLEAR_EVENTINF(EVENTINF_INTRO_CS_WATCHED_ODOLWA); + CLEAR_EVENTINF(EVENTINF_INTRO_CS_WATCHED_TWINMOLD); + CLEAR_EVENTINF(EVENTINF_INTRO_CS_WATCHED_GYORG); + CLEAR_EVENTINF(EVENTINF_INTRO_CS_WATCHED_IGOS_DU_IKANA); + CLEAR_EVENTINF(EVENTINF_INTRO_CS_WATCHED_WART); + CLEAR_EVENTINF(EVENTINF_INTRO_CS_WATCHED_MAJORA); + CLEAR_EVENTINF(EVENTINF_ENTR_CS_WATCHED_GOHT); + CLEAR_EVENTINF(EVENTINF_INTRO_CS_WATCHED_GOMESS); } sFinalHoursClockDigitsRed = sFinalHoursClockFrameEnvRed = sFinalHoursClockFrameEnvGreen = diff --git a/src/code/z_sub_s.c b/src/code/z_sub_s.c index 322cb6243..cdfd9273a 100644 --- a/src/code/z_sub_s.c +++ b/src/code/z_sub_s.c @@ -967,7 +967,7 @@ void SubS_FillShadowTex(s32 startCol, s32 startRow, u8* tex, s32 size) { } } -void SubS_GenShadowTex(Vec3f bodyPartsPos[], Vec3f* worldPos, u8* tex, f32 tween, u8 bodyPartsNum, u8 sizes[], +void SubS_GenShadowTex(Vec3f bodyPartsPos[], Vec3f* worldPos, u8* tex, f32 weight, u8 bodyPartsNum, u8 sizes[], s8 parentBodyParts[]) { Vec3f pos; Vec3f startVec; @@ -982,9 +982,9 @@ void SubS_GenShadowTex(Vec3f bodyPartsPos[], Vec3f* worldPos, u8* tex, f32 tween parentBodyPart = parentBodyParts[i]; bodyPartPos = &bodyPartsPos[i]; - pos.x = (bodyPartsPos[parentBodyPart].x - bodyPartPos->x) * tween + (bodyPartPos->x - worldPos->x); - pos.y = (bodyPartsPos[parentBodyPart].y - bodyPartPos->y) * tween + (bodyPartPos->y - worldPos->y); - pos.z = (bodyPartsPos[parentBodyPart].z - bodyPartPos->z) * tween + (bodyPartPos->z - worldPos->z); + pos.x = (bodyPartsPos[parentBodyPart].x - bodyPartPos->x) * weight + (bodyPartPos->x - worldPos->x); + pos.y = (bodyPartsPos[parentBodyPart].y - bodyPartPos->y) * weight + (bodyPartPos->y - worldPos->y); + pos.z = (bodyPartsPos[parentBodyPart].z - bodyPartPos->z) * weight + (bodyPartPos->z - worldPos->z); } else { bodyPartPos = &bodyPartsPos[i]; |