mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-15 12:08:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

kankyo mostly done (#2269)

Browse Source 
* work on kankyo

* some more kankyo work

* kankyo almost done

* kankyo mostly done

* first cleanup pass

* some more renaming

* rename a bunch of kankyo vars

* fix regression
This commit is contained in:
TakaRikka
2024-12-24 06:52:12 -08:00
committed by GitHub
parent d874f05f44
commit ad2badcd29
83 changed files with 5300 additions and 3384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_bg.cpp
+7 -7
View File
@@ -641,7 +641,7 @@ int daBg_c::draw() {
const char* name = modelData->getMaterialName()->getName(j);
if (!memcmp(&name[3], "MA12", 4)) {
if (g_env_light.mColPatCurr == 6) {
if (g_env_light.wether_pat1 == 6) {
field_0x5f0 = 0;
}
} else if (!memcmp(&name[3], "MA18", 4)) {
@@ -661,7 +661,7 @@ int daBg_c::draw() {
} else if (!memcmp(&name[3], "MA09", 4)) {
bgData->mBtkAnmSpeed = 1.0f - (1.0f - g_env_light.mWaterSurfaceShineRate) * 0.9f;
} else if (!memcmp(&name[3], "MA05", 4)) {
bgData->mpTevStr->field_0x378 |= (u8)j;
bgData->mpTevStr->Material_id |= (u8)j;
}
if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") ||
@@ -675,7 +675,7 @@ int daBg_c::draw() {
s16 var_r0;
s16 var_r3;
s16 var_r5;
switch (g_env_light.mPondSeason) {
switch (g_env_light.fishing_hole_season) {
case 2:
var_r5 = -3;
var_r0 = 0;
@@ -698,21 +698,21 @@ int daBg_c::draw() {
break;
}
f32 temp_f2 = bgData->mpTevStr->mColorC0.r / 10.0f;
f32 temp_f2 = bgData->mpTevStr->AmbCol.r / 10.0f;
f32 var_f2 = temp_f2 * temp_f2;
if (var_f2 > 1.0f) {
var_f2 = 1.0f;
}
colorS10.r = var_r5 * var_f2;
f32 temp_f2_2 = bgData->mpTevStr->mColorC0.g / 10.0f;
f32 temp_f2_2 = bgData->mpTevStr->AmbCol.g / 10.0f;
f32 var_f2_2 = temp_f2_2 * temp_f2_2;
if (var_f2_2 > 1.0f) {
var_f2_2 = 1.0f;
}
colorS10.g = var_r0 * var_f2_2;
f32 temp_f2_3 = bgData->mpTevStr->mColorC0.b / 10.0f;
f32 temp_f2_3 = bgData->mpTevStr->AmbCol.b / 10.0f;
f32 var_f2_3 = temp_f2_3 * temp_f2_3;
if (var_f2_3 > 1.0f) {
var_f2_3 = 1.0f;
@@ -900,4 +900,4 @@ extern "C" void calc__11J3DTexNoAnmCFPUs() {
// NONMATCHING
}
/* 804593A8-804593A8 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 804593A8-804593A8 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */