diff options
| author | Philip Dubé <serprex@users.noreply.github.com> | 2026-03-17 17:40:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-17 17:40:08 +0000 |
| commit | e9ef09eee4b29d69c7422a0b0524064a2af9dd01 (patch) | |
| tree | 79f44f00f3310b762d7c4d7dd907c768c3f66631 /soh/src/code | |
| parent | cefc9c02fa2bae8a4cd71019c397420d5064b2ad (diff) | |
Fix RBA gauntlet colors to match console (#6359)
Also fix tracker to show golden gauntlets while wearing glitched gauntlets,
& don't crash save editor
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_player_lib.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index 85964d457..34750ed2c 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -1019,6 +1019,11 @@ Color_RGB8 sTunicColors[] = { Color_RGB8 sGauntletColors[] = { { 255, 255, 255 }, { 254, 207, 15 }, + // #region SOH [RBA] values matching OOB reads on N64 + { 0, 0, 6 }, + { 2, 89, 24 }, + { 6, 2, 90 }, + { 96, 6, 2 }, }; Gfx* sBootDListGroups[][2] = { @@ -1098,13 +1103,11 @@ void Player_DrawImpl(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dL color = &sGauntletColors[strengthUpgrade - 2]; if (strengthUpgrade == PLAYER_STR_SILVER_G && CVarGetInteger(CVAR_COSMETIC("Gloves.SilverGauntlets.Changed"), 0)) { - sTemp = CVarGetColor24(CVAR_COSMETIC("Gloves.SilverGauntlets.Value"), - sGauntletColors[PLAYER_STR_SILVER_G - 2]); + sTemp = CVarGetColor24(CVAR_COSMETIC("Gloves.SilverGauntlets.Value"), *color); color = &sTemp; } else if (strengthUpgrade == PLAYER_STR_GOLD_G && CVarGetInteger(CVAR_COSMETIC("Gloves.GoldenGauntlets.Changed"), 0)) { - sTemp = CVarGetColor24(CVAR_COSMETIC("Gloves.GoldenGauntlets.Value"), - sGauntletColors[PLAYER_STR_GOLD_G - 2]); + sTemp = CVarGetColor24(CVAR_COSMETIC("Gloves.GoldenGauntlets.Value"), *color); color = &sTemp; } gDPSetEnvColor(POLY_OPA_DISP++, color->r, color->g, color->b, 0); |