diff --git a/autogen/lua_definitions/manual.lua b/autogen/lua_definitions/manual.lua index c0680411a..2ba4a4366 100644 --- a/autogen/lua_definitions/manual.lua +++ b/autogen/lua_definitions/manual.lua @@ -97,11 +97,6 @@ gServerSettings = {} --- Struct containing the settings for Nametags gNametagsSettings = {} ---- @type Camera ---- Struct contaning camera fields ---- - This camera is the same as `gMarioStates[i].area.camera` or `gCurrentArea.camera` -gCamera = {} - ----------- -- hooks -- ----------- diff --git a/src/game/mario_misc.c b/src/game/mario_misc.c index 4c13b7cfa..7cb509211 100644 --- a/src/game/mario_misc.c +++ b/src/game/mario_misc.c @@ -769,13 +769,13 @@ static struct PlayerColor geo_mario_get_player_color(const struct PlayerPalette for (s32 part = 0; part != PLAYER_PART_MAX; ++part) { color.parts[part] = (Lights1) gdSPDefLights1( // Shadow - palette->parts[part][0] * bodyState->shadeR / 255.0f, - palette->parts[part][1] * bodyState->shadeG / 255.0f, - palette->parts[part][2] * bodyState->shadeB / 255.0f, + min(palette->parts[part][0] * bodyState->shadeR / 255.0f, 255), + min(palette->parts[part][1] * bodyState->shadeG / 255.0f, 255), + min(palette->parts[part][2] * bodyState->shadeB / 255.0f, 255), // Light - palette->parts[part][0] * bodyState->lightR / 255.0f, - palette->parts[part][1] * bodyState->lightG / 255.0f, - palette->parts[part][2] * bodyState->lightB / 255.0f, + min(palette->parts[part][0] * bodyState->lightR / 255.0f, 255), + min(palette->parts[part][1] * bodyState->lightG / 255.0f, 255), + min(palette->parts[part][2] * bodyState->lightB / 255.0f, 255), 0x28 + bodyState->lightingDirX * 127.0f, 0x28 + bodyState->lightingDirY * 127.0f, 0x28 + bodyState->lightingDirZ * 127.0f ); }