diff options
Diffstat (limited to 'src/overlays/actors')
| -rw-r--r-- | src/overlays/actors/ovl_Train_Window/ac_train_window.c | 2 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_Weather/ac_weather.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/overlays/actors/ovl_Train_Window/ac_train_window.c b/src/overlays/actors/ovl_Train_Window/ac_train_window.c index a714a8b..36559c6 100644 --- a/src/overlays/actors/ovl_Train_Window/ac_train_window.c +++ b/src/overlays/actors/ovl_Train_Window/ac_train_window.c @@ -261,7 +261,7 @@ void aTrainWindow_SetLightPrimColorDetail(Game* game, u8 l, u8 polyAlpha, u8 xlu s32 current; for (i = 0; i < 3; i++) { - current = play->glight.ambientColor[i] + play->kankyo.sunColor[i]; + current = play->glight.ambientColor[i] + play->kankyo.baseLight.sunColor[i]; if (current < 0) { current = 0; } else if (current >= 256) { diff --git a/src/overlays/actors/ovl_Weather/ac_weather.h b/src/overlays/actors/ovl_Weather/ac_weather.h index 3a972d4..0b1b294 100644 --- a/src/overlays/actors/ovl_Weather/ac_weather.h +++ b/src/overlays/actors/ovl_Weather/ac_weather.h @@ -10,10 +10,6 @@ struct Game_Play; typedef struct Weather Weather; -//these might go better on kankyo -#define ENV_SAVE_GET_WEATHER_TYPE(w) (((w) & 0xF0) >> 4) -#define ENV_SAVE_GET_WEATHER_INTENSITY(w) ((w) & 0xF) - typedef struct WeatherPrv { /* 0x00 */ xyz_t pos; /* 0x0C */ xyz_t speed; |
