mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-02 07:46:01 +00:00
Code Issues Projects Releases Wiki Activity

add AVOID_UB for eyes/mouth reordering issue.

Browse source
This commit is contained in:
ProjectRevoTPP 2022-02-06 17:24:24 -05:00
parent e5115a76a5
commit cdfc414b9e
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/code/z_player_lib.c
View file

@ -654,7 +654,22 @@ u8 sEyeMouthIndexes[][2] = {
* This allows the array to only contain the symbols for one file and have it apply to both. This is a problem for * This allows the array to only contain the symbols for one file and have it apply to both. This is a problem for
* shiftability, and changes will need to be made in the code to account for this in a modding scenario. The symbols * shiftability, and changes will need to be made in the code to account for this in a modding scenario. The symbols
* from adult Link's object are used here. * from adult Link's object are used here.
*
* Using AVOID_UB here will use a 2D array instead and properly use the child link pointers to allow for shifting.
*/ */
#ifdef AVOID_UB
void* sEyeTextures[][8] = {
{ gLinkAdultEyesOpenTex, gLinkAdultEyesHalfTex, gLinkAdultEyesClosedfTex, gLinkAdultEyesRollLeftTex,
gLinkAdultEyesRollRightTex, gLinkAdultEyesShockTex, gLinkAdultEyesUnk1Tex, gLinkAdultEyesUnk2Tex },
{ gLinkChildEyesOpenTex, gLinkChildEyesHalfTex, gLinkChildEyesClosedfTex, gLinkChildEyesRollLeftTex,
gLinkChildEyesRollRightTex, gLinkChildEyesShockTex, gLinkChildEyesUnk1Tex, gLinkChildEyesUnk2Tex },
};
void* sMouthTextures[][4] = {
{ gLinkAdultMouth1Tex, gLinkAdultMouth2Tex, gLinkAdultMouth3Tex, gLinkAdultMouth4Tex },
{ gLinkChildMouth1Tex, gLinkChildMouth2Tex, gLinkChildMouth3Tex, gLinkChildMouth4Tex },
};
#else
void* sEyeTextures[] = { void* sEyeTextures[] = {
gLinkAdultEyesOpenTex, gLinkAdultEyesHalfTex, gLinkAdultEyesClosedfTex, gLinkAdultEyesRollLeftTex, gLinkAdultEyesOpenTex, gLinkAdultEyesHalfTex, gLinkAdultEyesClosedfTex, gLinkAdultEyesRollLeftTex,
gLinkAdultEyesRollRightTex, gLinkAdultEyesShockTex, gLinkAdultEyesUnk1Tex, gLinkAdultEyesUnk2Tex, gLinkAdultEyesRollRightTex, gLinkAdultEyesShockTex, gLinkAdultEyesUnk1Tex, gLinkAdultEyesUnk2Tex,
@ -666,6 +681,7 @@ void* sMouthTextures[] = {
gLinkAdultMouth3Tex, gLinkAdultMouth3Tex,
gLinkAdultMouth4Tex, gLinkAdultMouth4Tex,
}; };
#endif
Color_RGB8 sTunicColors[] = { Color_RGB8 sTunicColors[] = {
{ 30, 105, 27 }, { 30, 105, 27 },
@ -696,13 +712,21 @@ void func_8008F470(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable,
eyeIndex = sEyeMouthIndexes[face][0]; eyeIndex = sEyeMouthIndexes[face][0];
} }
#ifdef AVOID_UB
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[gSaveContext.linkAge][eyeIndex]));
#else
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[eyeIndex])); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[eyeIndex]));
#endif
if (mouthIndex < 0) { if (mouthIndex < 0) {
mouthIndex = sEyeMouthIndexes[face][1]; mouthIndex = sEyeMouthIndexes[face][1];
} }
#ifdef AVOID_UB
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[gSaveContext.linkAge][mouthIndex]));
#else
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[mouthIndex])); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[mouthIndex]));
#endif
color = &sTunicColors[tunic]; color = &sTunicColors[tunic];
gDPSetEnvColor(POLY_OPA_DISP++, color->r, color->g, color->b, 0); gDPSetEnvColor(POLY_OPA_DISP++, color->r, color->g, color->b, 0);