diff --git a/include/environment.h b/include/environment.h index f3348ebe9c..1c820ffebd 100644 --- a/include/environment.h +++ b/include/environment.h @@ -155,7 +155,7 @@ typedef struct CurrentEnvLightSettings { // The blendRate determines how fast the current light settings fade to the next one // (under LIGHT_MODE_SETTINGS, otherwise unused). -#define ENV_LIGHT_SETTINGS_BLEND_RATE_AND_FOG_NEAR_PACK(blendRate, fogNear) (s16)((((blendRate) / 4) << 10) | (fogNear)) +#define BLEND_RATE_AND_FOG_NEAR(blendRate, fogNear) (s16)((((blendRate) / 4) << 10) | (fogNear)) // Get blend rate from `EnvLightSettings.blendRateAndFogNear` in 0-255 range #define ENV_LIGHT_SETTINGS_BLEND_RATE_U8(blendRateAndFogNear) (u8)(((blendRateAndFogNear) >> 10) * 4) diff --git a/tools/assets/extract/extase_oot64/scene_rooms_resources.py b/tools/assets/extract/extase_oot64/scene_rooms_resources.py index 0285416903..3b632604cd 100644 --- a/tools/assets/extract/extase_oot64/scene_rooms_resources.py +++ b/tools/assets/extract/extase_oot64/scene_rooms_resources.py @@ -296,7 +296,7 @@ class EnvLightSettingsListResource(CDataArrayNamedLengthResource): if blendRate < 0: blendRate += 0x100 fogNear = v & 0x3FF - return f"ENV_LIGHT_SETTINGS_BLEND_RATE_AND_FOG_NEAR_PACK({blendRate}, {fogNear})" + return f"BLEND_RATE_AND_FOG_NEAR({blendRate}, {fogNear})" elem_cdata_ext = CDataExt_Struct( (