diff options
| author | aMannus <mannusmenting@gmail.com> | 2022-10-03 11:15:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 11:15:19 +0200 |
| commit | db2e6164cbccf3dc2f6aac9e976ef3ce732a24da (patch) | |
| tree | 6bd04fc313c08c80b11ad39679fa49e3cd0f677d /soh/src/code | |
| parent | 6bdca84b901fba583cfe1e74c54b744d48d2a480 (diff) | |
Add silver/golden gauntlets to Cosmetics Editor (#1683)
* Add golden gauntlets to Cosmetics Editor
* Removed extra space
* Fixed comment
* Changed comment again (helps if you save the file before committing)
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_player_lib.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index 4fa0542fc..5e5a10980 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -784,7 +784,14 @@ void func_8008F470(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable, if (strengthUpgrade >= 2) { // silver or gold gauntlets gDPPipeSync(POLY_OPA_DISP++); - color = &sGauntletColors[strengthUpgrade - 2]; + if (!CVar_GetS32("gUseGauntletsCol", 0)) { + color = &sGauntletColors[strengthUpgrade - 2]; + } else if (strengthUpgrade == PLAYER_STR_SILVER_G) { + *color = CVar_GetRGB("gGauntlets_Silver", sGauntletColors[PLAYER_STR_SILVER_G - 2]); + } else if (strengthUpgrade == PLAYER_STR_GOLD_G) { + *color = CVar_GetRGB("gGauntlets_Golden", sGauntletColors[PLAYER_STR_GOLD_G - 2]); + } + gDPSetEnvColor(POLY_OPA_DISP++, color->r, color->g, color->b, 0); gSPDisplayList(POLY_OPA_DISP++, gLinkAdultLeftGauntletPlate1DL); |