mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-30 15:43:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/zeldaret/tp

Browse Source
This commit is contained in:
TakaRikka
2026-03-12 17:56:51 -07:00
parent 875b849c30 bc9bf9d062
commit cb85da153c
931 changed files with 25778 additions and 24285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_kankyo_rain.cpp
+10 -10
View File
@@ -5040,7 +5040,7 @@ void dKyr_thunder_move() {
effect->mLightInfluence.mFluctuation = 1.0f;
dKy_efplight_set(&effect->mLightInfluence);
effect->field_0x1c = 0.6f + cM_rndF(0.4f);
fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL);
fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL);
effect->mState++;
}
} else if (strcmp(dComIfGp_getStartStageName(), "D_MN09B") == 0 && dComIfGp_event_runCheck()) {
@@ -5055,14 +5055,14 @@ void dKyr_thunder_move() {
effect->mLightInfluence.mFluctuation = 1.0f;
dKy_efplight_set(&effect->mLightInfluence);
effect->field_0x1c = 0.6f + cM_rndF(0.4f);
fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL);
fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL);
effect->mState++;
}
} else if (cM_rndF(1.0f) < 0.007f) {
effect->field_0x1c = 0.6f + cM_rndF(0.4f);
effect->mState = 11;
if (cM_rndF(1.0f) < 0.2f) {
fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL);
fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL);
}
} else if (cM_rndF(1.0f) < 0.005f && g_env_light.mThunderEff.mMode < 10 && sp10 != 1) {
effect->mLightInfluence.mPosition = camera->view.lookat.eye;
@@ -5073,7 +5073,7 @@ void dKyr_thunder_move() {
effect->mLightInfluence.mFluctuation = 1.0f;
dKy_efplight_set(&effect->mLightInfluence);
effect->field_0x1c = 0.6f + cM_rndF(0.4f);
fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL);
fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL);
effect->mState++;
}
break;
@@ -5102,7 +5102,7 @@ void dKyr_thunder_move() {
} else if (effect->mFlashTimer <= 0.5f && effect->mFlashTimer > 0.4f && cM_rndF(1.0f) < 0.3f) {
effect->field_0x1c = 0.6f + cM_rndF(0.4f);
if (cM_rndF(1.0f) < 0.05f) {
fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL);
fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL);
}
effect->mState--;
}
@@ -5326,7 +5326,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
#endif
switch (dComIfGs_getCollectSmell()) {
case fpcNm_ITEM_SMELL_YELIA_POUCH:
case dItemNo_SMELL_YELIA_POUCH_e:
color_reg0.r = 0xFF;
color_reg0.g = 0xFF;
color_reg0.b = 0xFF;
@@ -5336,7 +5336,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
color_reg1.b = 0xA8;
color_reg1.a = 0xFF;
break;
case fpcNm_ITEM_SMELL_FISH:
case dItemNo_SMELL_FISH_e:
color_reg0.r = 0xFF;
color_reg0.g = 0xA1;
color_reg0.b = 0x3B;
@@ -5346,7 +5346,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
color_reg1.b = 0x32;
color_reg1.a = 0xFF;
break;
case fpcNm_ITEM_SMELL_CHILDREN:
case dItemNo_SMELL_CHILDREN_e:
color_reg0.r = 0xFF;
color_reg0.g = 0xDB;
color_reg0.b = 0xFF;
@@ -5356,7 +5356,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
color_reg1.b = 0x52;
color_reg1.a = 0xFF;
break;
case fpcNm_ITEM_SMELL_MEDICINE:
case dItemNo_SMELL_MEDICINE_e:
color_reg0.r = 0xD5;
color_reg0.g = 0xCE;
color_reg0.b = 0xA7;
@@ -5366,7 +5366,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
color_reg1.b = 0x27;
color_reg1.a = 0xFF;
break;
case fpcNm_ITEM_SMELL_POH:
case dItemNo_SMELL_POH_e:
color_reg0.r = 0xFF;
color_reg0.g = 0xC8;
color_reg0.b = 0xFF;