mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-29 23:48:25 -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_alink.cpp
+2 -2
View File
@@ -6248,7 +6248,7 @@ s32 daAlink_c::setRoomInfo() {
roomID = dComIfG_Bgsp().GetRoomId(mLinkAcch.m_gnd);
if (roomID != fopAcM_GetRoomNo(this)) {
tevStr.mRoomNo = roomID;
tevStr.room_no = roomID;
mVoiceReverbIntensity = dComIfGp_getReverb(roomID);
field_0x814.SetRoomId(roomID);
fopAcM_SetRoomNo(this, roomID);
@@ -6259,7 +6259,7 @@ s32 daAlink_c::setRoomInfo() {
roomID = fopAcM_GetRoomNo(this);
}
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mLinkAcch.m_gnd);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mLinkAcch.m_gnd);
field_0x3174 = dComIfG_Bgsp().GetGroundCode(mLinkAcch.m_gnd);
field_0x2fbb = dComIfG_Bgsp().GetPolyAtt0(mLinkAcch.m_gnd);
mGndPolySpecialCode = dComIfG_Bgsp().GetSpecialCode(mLinkAcch.m_gnd);
src/d/actor/d_a_alink_grab.inc
+2 -2
View File
@@ -206,8 +206,8 @@ void daAlink_c::setGrabItemPos() {
daPy_frameCtrl_c* sp1C = &mUnderFrameCtrl[0];
s8 sp8 = fopAcM_GetRoomNo(this);
temp_r3->tevStr.mRoomNo = sp8;
temp_r3->tevStr.mEnvrIdxOverride = tevStr.mEnvrIdxOverride;
temp_r3->tevStr.room_no = sp8;
temp_r3->tevStr.YukaCol = tevStr.YukaCol;
fopAcM_SetRoomNo(temp_r3, sp8);
BOOL sp18 = checkGrabCarryActor();
src/d/actor/d_a_alink_hook.inc
+4 -4
View File
@@ -33,10 +33,10 @@ void daAlink_c::hsChainShape_c::draw() {
sp5C->getShape()->loadPreDrawSetting();
GXColor sp58;
sp58.r = temp_r29->mColorC0.r;
sp58.g = temp_r29->mColorC0.g;
sp58.b = temp_r29->mColorC0.b;
sp58.a = temp_r29->mColorC0.a;
sp58.r = temp_r29->AmbCol.r;
sp58.g = temp_r29->AmbCol.g;
sp58.b = temp_r29->AmbCol.b;
sp58.a = temp_r29->AmbCol.a;
GXSetChanAmbColor(GX_COLOR0A0, sp58);
GXSetChanMatColor(GX_COLOR0A0, g_whiteColor);
src/d/actor/d_a_alink_link.inc
+51 -51
View File
@@ -3910,12 +3910,12 @@ void daAlink_c::setWaterDropColor(const J3DGXColorS10* i_color) {
/* 800CC7DC-800CC7FC 0C711C 0020+00 2/2 0/0 0/0 .text initTevCustomColor__9daAlink_cFv */
void daAlink_c::initTevCustomColor() {
tevStr.field_0x367 = 0;
tevStr.mFogColor.r = 0;
tevStr.mFogColor.g = 0;
tevStr.mFogColor.b = 0;
tevStr.field_0x360 = 0;
tevStr.field_0x362 = 0;
tevStr.mLightInf.a = 0;
tevStr.TevColor.r = 0;
tevStr.TevColor.g = 0;
tevStr.TevColor.b = 0;
tevStr.TevKColor.r = 0;
tevStr.TevKColor.b = 0;
}
/* 800CC7FC-800CD78C 0C713C 0F90+00 1/1 0/0 0/0 .text draw__9daAlink_cFv */
@@ -3946,13 +3946,13 @@ int daAlink_c::draw() {
if (mClothesChangeWaitTimer != 0) {
if (mProcID == PROC_METAMORPHOSE) {
if (mProcVar3.field_0x300e > 0) {
tevStr.mFogColor.r = 255;
tevStr.TevColor.r = 255;
} else {
tevStr.mFogColor.r = -255;
tevStr.TevColor.r = -255;
}
tevStr.mFogColor.g = tevStr.mFogColor.r;
tevStr.mFogColor.b = tevStr.mFogColor.r;
tevStr.TevColor.g = tevStr.TevColor.r;
tevStr.TevColor.b = tevStr.TevColor.r;
g_env_light.setLightTevColorType_MAJI(mpWlChangeModel, &tevStr);
mDoExt_modelEntryDL(mpWlChangeModel);
@@ -3965,22 +3965,22 @@ int daAlink_c::draw() {
BOOL var_r31 = 1;
if (field_0x06f4 != NULL) {
field_0x06f4->getTevColorReg(0, &tevStr.mFogColor);
field_0x06f4->getTevColorReg(0, &tevStr.TevColor);
} else if (mProcID == PROC_METAMORPHOSE || mProcID == PROC_DUNGEON_WARP ||
mProcID == PROC_DUNGEON_WARP_SCN_START)
{
tevStr.mFogColor.r = mProcVar3.field_0x300e;
tevStr.mFogColor.g = mProcVar3.field_0x300e;
tevStr.mFogColor.b = mProcVar3.field_0x300e;
tevStr.TevColor.r = mProcVar3.field_0x300e;
tevStr.TevColor.g = mProcVar3.field_0x300e;
tevStr.TevColor.b = mProcVar3.field_0x300e;
} else if (field_0x346c != 0.0f) {
f32 var_f2 = fabsf(field_0x346c);
tevStr.mFogColor.r = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropR;
tevStr.mFogColor.g = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropG;
tevStr.mFogColor.b = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropB;
tevStr.TevColor.r = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropR;
tevStr.TevColor.g = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropG;
tevStr.TevColor.b = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropB;
} else if (checkFreezeDamage()) {
tevStr.mFogColor.r = daAlinkHIO_damage_c0::m.mFreezeR;
tevStr.mFogColor.g = daAlinkHIO_damage_c0::m.mFreezeG;
tevStr.mFogColor.b = daAlinkHIO_damage_c0::m.mFreezeB;
tevStr.TevColor.r = daAlinkHIO_damage_c0::m.mFreezeR;
tevStr.TevColor.g = daAlinkHIO_damage_c0::m.mFreezeG;
tevStr.TevColor.b = daAlinkHIO_damage_c0::m.mFreezeB;
} else if (mDamageTimer != 0) {
if (!checkMagicArmorNoDamage()) {
int color_timer = mDamageTimer + mDamageColorTime;
@@ -4001,25 +4001,25 @@ int daAlink_c::draw() {
}
f32 var_f2 = fabsf(cM_ssin(color_timer * 0x800));
tevStr.field_0x360 = r * var_f2;
tevStr.field_0x361 = g * var_f2;
tevStr.field_0x362 = b * var_f2;
tevStr.TevKColor.r = r * var_f2;
tevStr.TevKColor.g = g * var_f2;
tevStr.TevKColor.b = b * var_f2;
var_r31 = 0;
}
} else if (mIceDamageWaitTimer != 0) {
f32 temp_f4 = 1.0f - (mIceDamageWaitTimer * (1.0f / daAlinkHIO_damage_c0::m.mFreezeTime));
f32 temp_f3 = 1.0f - temp_f4;
tevStr.mFogColor.r = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitR) +
tevStr.TevColor.r = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitR) +
(temp_f3 * daAlinkHIO_damage_c0::m.mFreezeR);
tevStr.mFogColor.g = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitG) +
tevStr.TevColor.g = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitG) +
(temp_f3 * daAlinkHIO_damage_c0::m.mFreezeG);
tevStr.mFogColor.b = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitB) +
tevStr.TevColor.b = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitB) +
(temp_f3 * daAlinkHIO_damage_c0::m.mFreezeB);
} else if (field_0x32b0[0].r != 0) {
tevStr.mFogColor.r = field_0x32b0[0].r;
tevStr.mFogColor.g = field_0x32b0[0].g;
tevStr.mFogColor.b = field_0x32b0[0].b;
tevStr.TevColor.r = field_0x32b0[0].r;
tevStr.TevColor.g = field_0x32b0[0].g;
tevStr.TevColor.b = field_0x32b0[0].b;
var_r29 = 1;
} else {
var_r31 = 0;
@@ -4036,7 +4036,7 @@ int daAlink_c::draw() {
setWaterDropColor(&field_0x32b0[1]);
} else {
mSwordUpColorIntensity = 0.0f;
setWaterDropColor((J3DGXColorS10*)&tevStr.mFogColor);
setWaterDropColor((J3DGXColorS10*)&tevStr.TevColor);
}
} else {
if (checkMagicArmorWearAbility()) {
@@ -4060,9 +4060,9 @@ int daAlink_c::draw() {
}
}
tevStr.field_0x360 = 0;
tevStr.field_0x361 = 0;
tevStr.field_0x362 = 0;
tevStr.TevKColor.r = 0;
tevStr.TevKColor.g = 0;
tevStr.TevKColor.b = 0;
if (checkSwordDraw()) {
modelDraw(mSwordModel, temp_r30);
@@ -4147,9 +4147,9 @@ int daAlink_c::draw() {
modelDraw(mpLinkFaceModel, var_r3);
}
tevStr.field_0x360 = 0;
tevStr.field_0x361 = 0;
tevStr.field_0x362 = 0;
tevStr.TevKColor.r = 0;
tevStr.TevKColor.g = 0;
tevStr.TevKColor.b = 0;
if (checkSwordDraw()) {
if (!checkNoResetFlg3(FLG3_UNK_80000000)) {
@@ -4164,9 +4164,9 @@ int daAlink_c::draw() {
if (checkShieldDraw()) {
BOOL var_r24_2;
if (checkWoodShieldEquip() && field_0x2fcb != 0 && mProcID != PROC_METAMORPHOSE) {
tevStr.mFogColor.r = -((120 - field_0x2fcb) * 32) / 120;
tevStr.mFogColor.g = tevStr.mFogColor.r;
tevStr.mFogColor.b = tevStr.mFogColor.r;
tevStr.TevColor.r = -((120 - field_0x2fcb) * 32) / 120;
tevStr.TevColor.g = tevStr.TevColor.r;
tevStr.TevColor.b = tevStr.TevColor.r;
var_r24_2 = 1;
} else {
var_r24_2 = 0;
@@ -4174,16 +4174,16 @@ int daAlink_c::draw() {
modelDraw(mShieldModel, var_r3);
if (var_r24_2) {
tevStr.mFogColor.r = 0;
tevStr.mFogColor.g = 0;
tevStr.mFogColor.b = 0;
tevStr.TevColor.r = 0;
tevStr.TevColor.g = 0;
tevStr.TevColor.b = 0;
}
}
if (var_r29) {
tevStr.mFogColor.r = 0;
tevStr.mFogColor.g = 0;
tevStr.mFogColor.b = 0;
tevStr.TevColor.r = 0;
tevStr.TevColor.g = 0;
tevStr.TevColor.b = 0;
}
if (checkItemDraw()) {
@@ -4228,22 +4228,22 @@ int daAlink_c::draw() {
}
if (checkEquipHeavyBoots()) {
GXColorS10 color = tevStr.mFogColor;
GXColorS10 color = tevStr.TevColor;
for (int i = 0; i < 2; i++) {
JPABaseEmitter* emitter_p = dComIfGp_particle_getEmitter(field_0x3228[i][0]);
if (emitter_p != NULL) {
tevStr.mFogColor.r = 5;
tevStr.mFogColor.g = tevStr.mFogColor.r;
tevStr.mFogColor.b = tevStr.mFogColor.r;
tevStr.TevColor.r = 5;
tevStr.TevColor.g = tevStr.TevColor.r;
tevStr.TevColor.b = tevStr.TevColor.r;
} else {
tevStr.mFogColor = color;
tevStr.TevColor = color;
}
modelDraw(mpLinkBootModels[i], temp_r30);
}
tevStr.mFogColor = color;
tevStr.TevColor = color;
}
}
src/d/actor/d_a_arrow.cpp
+8 -8
View File
@@ -356,12 +356,12 @@ void daArrow_c::setRoomInfo() {
if (fopAcM_gc_c::gndCheck(&current.pos)) {
roomNo = fopAcM_gc_c::getRoomId();
tevStr.mEnvrIdxOverride = fopAcM_gc_c::getPolyColor();
tevStr.YukaCol = fopAcM_gc_c::getPolyColor();
} else {
roomNo = dComIfGp_roomControl_getStayNo();
}
tevStr.mRoomNo = roomNo;
tevStr.room_no = roomNo;
field_0x64c.SetRoomId(roomNo);
fopAcM_SetRoomNo(this, roomNo);
}
@@ -519,9 +519,9 @@ int daArrow_c::procWait() {
u32 param = fopAcM_GetParam(this);
if (param == 1 || param == 2) {
tevStr.mFogColor.r = 0;
tevStr.mFogColor.g = 0;
tevStr.mFogColor.b = 0;
tevStr.TevColor.r = 0;
tevStr.TevColor.g = 0;
tevStr.TevColor.b = 0;
daAlink_c* link = daAlink_getAlinkActorClass();
if (mArrowType == 1) {
@@ -1162,9 +1162,9 @@ int daArrow_c::draw() {
}
if (field_0x943 != 0) {
tevStr.mFogColor.r = link->getFreezeR();
tevStr.mFogColor.g = link->getFreezeG();
tevStr.mFogColor.b = link->getFreezeB();
tevStr.TevColor.r = link->getFreezeR();
tevStr.TevColor.g = link->getFreezeG();
tevStr.TevColor.b = link->getFreezeB();
}
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
src/d/actor/d_a_b_bq.cpp
+2 -2
View File
@@ -2515,8 +2515,8 @@ static int daB_BQ_Create(fopAc_ac_c* i_this) {
}
g_env_light.mColpatWeather = 6;
g_env_light.mColPatPrev = 6;
g_env_light.mColPatCurr = 6;
g_env_light.wether_pat0 = 6;
g_env_light.wether_pat1 = 6;
fish_set(a_this);
return cPhs_ERROR_e;
}
src/d/actor/d_a_b_yo.cpp
+2 -2
View File
@@ -3457,8 +3457,8 @@ cPhs__Step daB_YO_c::create() {
mColorMode = 4;
mColBlend = 1.0f;
g_env_light.mColpatWeather = 2;
g_env_light.mColPatPrev = 2;
g_env_light.mColPatCurr = 2;
g_env_light.wether_pat0 = 2;
g_env_light.wether_pat1 = 2;
fopAcM_OffStatus(this, 0x4000);
} else {
src/d/actor/d_a_b_zant.cpp
+1 -1
View File
@@ -4782,7 +4782,7 @@ void daB_ZANT_c::initNextRoom() {
}
}
tevStr.mRoomNo = warp_next_room[mFightPhase];
tevStr.room_no = warp_next_room[mFightPhase];
}
/* 8064B868-8064C1C0 00D848 0958+00 2/1 0/0 0/0 .text executeRoomChange__10daB_ZANT_cFv
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 */
src/d/actor/d_a_boomerang.cpp
+2 -2
View File
@@ -1021,11 +1021,11 @@ void daBoomerang_c::setRoomInfo() {
int roomNo;
if (field_0x980 != -1000000000.0f) {
roomNo = dComIfG_Bgsp().GetRoomId(field_0xd6c);
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(field_0xd6c);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(field_0xd6c);
} else {
roomNo = dComIfGp_roomControl_getStayNo();
}
tevStr.mRoomNo = roomNo;
tevStr.room_no = roomNo;
field_0x953 = dComIfGp_getReverb(roomNo);
field_0x9d0.SetRoomId(roomNo);
fopAcM_SetRoomNo(this, roomNo);
src/d/actor/d_a_door_dbdoor00.cpp
+1 -1
View File
@@ -165,7 +165,7 @@ int daDbDoor00_c::CreateInit() {
u8 fRoomNo = door_param2_c::getFRoomNo(this);
if (fopAcM_GetRoomNo(this) == -1) {
fopAcM_SetRoomNo(this, fRoomNo);
tevStr.mRoomNo = current.roomNo;
tevStr.room_no = current.roomNo;
}
dComIfG_Bgsp().Regist(mpBgW, this);
field_0x584 = 1;
src/d/actor/d_a_door_knob00.cpp
+2 -2
View File
@@ -153,7 +153,7 @@ void daKnob20_c::calcMtx() {
int daKnob20_c::CreateInit() {
int rt = dComIfG_Bgsp().Regist(field_0x5a0, this);
JUT_ASSERT(299, rt == 0);
tevStr.mRoomNo = current.roomNo;
tevStr.room_no = current.roomNo;
setAction(ACTION_INIT);
attention_info.position.y += 150.0f;
eyePos.y += 150.0f;
@@ -165,7 +165,7 @@ int daKnob20_c::CreateInit() {
field_0x5a0->Move();
eventInfo.setArchiveName(getEvArcName());
setEventId();
tevStr.mLightInf = knob_param_c::getDoorLightInf(this);
tevStr.mLightInf.r = knob_param_c::getDoorLightInf(this);
return 1;
}
src/d/actor/d_a_door_mbossL1.cpp
+1 -1
View File
@@ -530,7 +530,7 @@ int daMBdoorL1_c::CreateInit() {
} else {
lightInf = door_param2_c::getMBLightInf(this);
}
tevStr.mLightInf = lightInf;
tevStr.mLightInf.r = lightInf;
return 1;
}
src/d/actor/d_a_door_shutter.cpp
+8 -8
View File
@@ -790,7 +790,7 @@ int daDoor20_c::CreateInit() {
&field_0x8b8, fopAcM_GetSpeed_p(this), NULL, NULL);
int rt = dComIfG_Bgsp().Regist(field_0x5c4, this);
JUT_ASSERT(1512, !rt);
tevStr.mRoomNo = current.roomNo;
tevStr.room_no = current.roomNo;
setAction(ACTION_INIT);
attention_info.position.y += 150.0f;
eyePos.y += 150.0f;
@@ -1314,7 +1314,7 @@ int daDoor20_c::execute() {
} else {
lightInf = door_param2_c::getBLightInf(this);
}
tevStr.mLightInf = lightInf;
tevStr.mLightInf.r = lightInf;
if (strcmp(dComIfGp_getStartStageName(), "D_MN05") != 0 && strcmp(dComIfGp_getStartStageName(), "D_MN04") != 0) {
field_0x6de.CrrPos(dComIfG_Bgsp());
}
@@ -1541,19 +1541,19 @@ int daDoor20_c::drawCheck(int param_1) {
door_param2_c::getBackOption(this);
int stayNo = dComIfGp_roomControl_getStayNo();
if (fRoomNo == stayNo || bRoomNo == stayNo) {
tevStr.mRoomNo = stayNo;
tevStr.room_no = stayNo;
} else {
if (dComIfGp_roomControl_checkRoomDisp(fRoomNo)) {
tevStr.mRoomNo = fRoomNo;
tevStr.room_no = fRoomNo;
} else if (dComIfGp_roomControl_checkRoomDisp(bRoomNo)) {
tevStr.mRoomNo = bRoomNo;
tevStr.room_no = bRoomNo;
}
}
if (field_0x678 != -1) {
tevStr.mRoomNo = field_0x674;
tevStr.room_no = field_0x674;
}
fopAcM_SetRoomNo(this, tevStr.mRoomNo);
if (!dComIfGp_roomControl_checkRoomDisp(tevStr.mRoomNo)) {
fopAcM_SetRoomNo(this, tevStr.room_no);
if (!dComIfGp_roomControl_checkRoomDisp(tevStr.room_no)) {
return 1;
} else {
return 1;
src/d/actor/d_a_e_vt.cpp
+8 -8
View File
@@ -3969,8 +3969,8 @@ int daE_VA_c::create() {
if (mSwNo != 0xFF && dComIfGs_isSwitch(mSwNo, fopAcM_GetRoomNo(this))) {
g_env_light.mColpatWeather = 4;
g_env_light.mColPatPrev = 4;
g_env_light.mColPatCurr = 4;
g_env_light.wether_pat0 = 4;
g_env_light.wether_pat1 = 4;
return cPhs_ERROR_e;
}
@@ -4028,8 +4028,8 @@ int daE_VA_c::create() {
attention_info.distances[fopAc_attn_BATTLE_e] = 62;
g_env_light.mColpatWeather = 2;
g_env_light.mColPatPrev = 2;
g_env_light.mColPatCurr = 2;
g_env_light.wether_pat0 = 2;
g_env_light.wether_pat1 = 2;
if (daPy_getPlayerActorClass()->current.pos.z >= 1850.0f) {
cDmr_SkipInfo = 0;
@@ -4046,14 +4046,14 @@ int daE_VA_c::create() {
mKankyoColType = 0;
g_env_light.mColpatWeather = 2;
g_env_light.mColPatPrev = 2;
g_env_light.mColPatCurr = 2;
g_env_light.wether_pat0 = 2;
g_env_light.wether_pat1 = 2;
} else {
mAction = ACTION_DEMO_OP_WAIT_e;
mKankyoColType = 5;
g_env_light.mColpatWeather = 3;
g_env_light.mColPatPrev = 3;
g_env_light.mColPatCurr = 3;
g_env_light.wether_pat0 = 3;
g_env_light.wether_pat1 = 3;
}
daE_VA_Execute(this);
src/d/actor/d_a_kytag00.cpp
+5 -5
View File
@@ -87,7 +87,7 @@ static void wether_tag_move(kytag00_class* i_this) {
}
var_f9 *= (var_f8 * i_this->field_0x588);
if (g_env_light.mEnvrIdxPrev == g_env_light.mEnvrIdxCurr) {
if (g_env_light.PrevCol == g_env_light.UseCol) {
i_this->field_0x56d = 1;
switch (i_this->field_0x56f) {
@@ -140,14 +140,14 @@ static void wether_tag_move(kytag00_class* i_this) {
/* 8046BD60-8046BDA4 0006C0 0044+00 1/1 0/0 0/0 .text raincnt_set__Ff */
static void raincnt_set(f32 param_0) {
int cnt = param_0 * param_0 * param_0 * 250.0f;
if (cnt > g_env_light.mRainCountOrig) {
g_env_light.mRainCount = cnt;
if (cnt > g_env_light.base_raincnt) {
g_env_light.raincnt = cnt;
}
}
/* 8046BDA4-8046BDB8 000704 0014+00 1/1 0/0 0/0 .text raincnt_cut__Fv */
static void raincnt_cut() {
g_env_light.mRainCount = g_env_light.mRainCountOrig;
g_env_light.raincnt = g_env_light.base_raincnt;
}
/* 8046BDB8-8046BEB8 000718 0100+00 3/2 0/0 0/0 .text wether_tag_efect_reset__FP13kytag00_class */
@@ -332,7 +332,7 @@ static void wether_tag_efect_move(kytag00_class* i_this) {
break;
case 11:
g_env_light.mMoyaMode = 50;
g_env_light.mMoyaCount = var_f9 * 50.0f * g_env_light.field_0xf40;
g_env_light.mMoyaCount = var_f9 * 50.0f * g_env_light.senses_effect_strength;
break;
case 12:
g_env_light.mMoyaMode = 5;
src/d/actor/d_a_kytag01.cpp
+3 -3
View File
@@ -183,10 +183,10 @@ static int daKytag01_Create(fopAc_ac_c* i_this) {
if (a_this->mStartPoint == dComIfGs_getStartPoint() &&
i_this->home.roomNo == dComIfGp_roomControl_getStayNo())
{
a_this->field_0x59e = g_env_light.mColPatPrev;
a_this->field_0x59e = g_env_light.wether_pat0;
g_env_light.mColpatWeather = a_this->field_0x59d;
g_env_light.mColPatPrev = a_this->field_0x59d;
g_env_light.mColPatCurr = g_env_light.mColPatPrev;
g_env_light.wether_pat0 = a_this->field_0x59d;
g_env_light.wether_pat1 = g_env_light.wether_pat0;
}
} else {
a_this->mNamiSize = (int)((fopAcM_GetParam(i_this) >> 0x10) & 0xFF);
src/d/actor/d_a_kytag02.cpp
+8 -8
View File
@@ -22,7 +22,7 @@ static int daKytag02_Execute(kytag02_class* i_this) {
dKyw_evt_wind_set(0, i_this->current.angle.y);
if (i_this->field_0x578 != 99) {
env_light->mTeachWindExist = 1;
env_light->TeachWind_existence = 1;
env_light->mMoyaMode = 4;
env_light->mMoyaCount = 50;
@@ -57,18 +57,18 @@ static int daKytag02_Execute(kytag02_class* i_this) {
i_this->field_0x574--;
}
} else {
env_light->mTeachWindExist = 0xFF;
env_light->TeachWind_existence = 0xFF;
env_light->custom_windpower = 0.3f;
}
} else {
env_light = dKy_getEnvlight();
env_light->mEvtWindSet = 0;
env_light->evt_wind_go = 0;
if (i_this->field_0x578 != 99) {
env_light->mMoyaCount = 0;
}
env_light->mTeachWindExist = 0;
env_light->TeachWind_existence = 0;
}
if (i_this->field_0x578 != 99) {
@@ -91,9 +91,9 @@ static int daKytag02_IsDelete(kytag02_class* i_this) {
static int daKytag02_Delete(kytag02_class* i_this) {
dScnKy_env_light_c* env_light = dKy_getEnvlight();
env_light->mEvtWindSet = 0;
env_light->evt_wind_go = 0;
env_light->mMoyaCount = 0;
env_light->mTeachWindExist = 0;
env_light->TeachWind_existence = 0;
return 1;
}
@@ -118,9 +118,9 @@ static int daKytag02_Create(fopAc_ac_c* i_this) {
dKyw_evt_wind_set(0, a_this->current.angle.y);
if (a_this->field_0x578 == 99) {
env_light->mTeachWindExist = 0xFF;
env_light->TeachWind_existence = 0xFF;
} else {
env_light->mTeachWindExist = 1;
env_light->TeachWind_existence = 1;
env_light->mMoyaMode = 4;
env_light->mMoyaCount = 50;
}
src/d/actor/d_a_kytag03.cpp
+1 -1
View File
@@ -365,7 +365,7 @@ static int daKytag03_Execute(kytag03_class* i_this) {
i_this->mpEmitter->setGlobalEnvColor(0x44, 0x1A, 0x6B);
}
i_this->mpEmitter->setGlobalAlpha(kankyo->field_0xf40 * 223.0f + 32.0f);
i_this->mpEmitter->setGlobalAlpha(kankyo->senses_effect_strength * 223.0f + 32.0f);
}
if (i_this->field_0x585 != dComIfGs_getCollectSmell()) {
src/d/actor/d_a_kytag06.cpp
+112 -112
View File
@@ -13,32 +13,32 @@
static void dice_wether_init(u8 i_weatherMode, f32 i_weatherTime, f32 i_currentTime) {
dScnKy_env_light_c* env_light = dKy_getEnvlight();
env_light->mDiceWeatherMode = i_weatherMode;
env_light->mDiceWeatherTime =
env_light->dice_wether_mode = i_weatherMode;
env_light->dice_wether_time =
i_currentTime + i_weatherTime + cM_rndF(i_weatherTime) + cM_rndF(i_weatherTime);
if (env_light->mDiceWeatherTime >= 360.0f) {
env_light->mDiceWeatherTime -= 360.0f;
if (env_light->dice_wether_time >= 360.0f) {
env_light->dice_wether_time -= 360.0f;
}
}
/* 80857918-808579EC 000198 00D4+00 1/1 0/0 0/0 .text dice_wether_execute__FUcff */
static void dice_wether_execute(u8 i_weatherMode, f32 i_weatherTime, f32 i_currentTime) {
dScnKy_env_light_c* env_light = dKy_getEnvlight();
env_light->mDiceWeatherMode = i_weatherMode;
env_light->dice_wether_mode = i_weatherMode;
if (env_light->mDiceWeatherMode != DICE_MODE_DONE_e) {
env_light->mDiceWeatherTime =
if (env_light->dice_wether_mode != DICE_MODE_DONE_e) {
env_light->dice_wether_time =
i_currentTime + i_weatherTime + cM_rndF(i_weatherTime) + cM_rndF(i_weatherTime);
if (env_light->mDiceWeatherTime >= 360.0f) {
env_light->mDiceWeatherTime -= 360.0f;
if (env_light->dice_wether_time >= 360.0f) {
env_light->dice_wether_time -= 360.0f;
}
env_light->mDiceWeatherCounter++;
env_light->dice_wether_counter++;
} else {
env_light->mDiceWeatherMode = DICE_MODE_SUNNY_e;
env_light->mDiceWeatherState++;
env_light->dice_wether_mode = DICE_MODE_SUNNY_e;
env_light->dice_wether_state++;
}
}
@@ -48,13 +48,13 @@ static void dice_rain_minus() {
if ((g_Counter.mCounter0 & 3) == 0) {
// run block every 4 frames
if (env_light->mRainCount > 40) {
env_light->mRainCount -= 3;
} else if (env_light->mRainCount != 0) {
env_light->mRainCount--;
if (env_light->raincnt > 40) {
env_light->raincnt -= 3;
} else if (env_light->raincnt != 0) {
env_light->raincnt--;
}
dKyw_rain_set(env_light->mRainCount);
dKyw_rain_set(env_light->raincnt);
}
}
@@ -99,86 +99,86 @@ static void dKy_event_proc() {
dScnKy_env_light_c* env_light = dKy_getEnvlight();
if (!g_env_light.mCameraInWater) {
if (g_env_light.mInitAnmTimer == 0) {
if (!g_env_light.camera_water_in_status) {
if (g_env_light.light_init_timer == 0) {
f32 current_time = dComIfGs_getTime();
switch (env_light->mDiceWeatherState) {
switch (env_light->dice_wether_state) {
case DICE_STATE_RESET_e:
if (current_time > env_light->mDiceWeatherChangeTime &&
current_time - env_light->mDiceWeatherChangeTime < 15.0f)
if (current_time > env_light->dice_wether_change_time &&
current_time - env_light->dice_wether_change_time < 15.0f)
{
env_light->mDiceWeatherState = DICE_STATE_INIT_e;
env_light->dice_wether_state = DICE_STATE_INIT_e;
}
break;
case DICE_STATE_INIT_e:
u8 table_no = cM_rndF(12.99f);
if (table_no >= 8) {
env_light->mDiceWeatherState = DICE_STATE_NEXT_e;
env_light->dice_wether_state = DICE_STATE_NEXT_e;
} else {
env_light->mDiceWeatherCurrPattern = S_wether_table[table_no];
env_light->mDiceWeatherCounter = 0;
env_light->dice_wether_pat = S_wether_table[table_no];
env_light->dice_wether_counter = 0;
switch (env_light->mDiceWeatherCurrPattern) {
switch (env_light->dice_wether_pat) {
case 0:
dice_wether_init(S_wether_mode_pat01[env_light->mDiceWeatherCounter],
S_wether_time_pat01[env_light->mDiceWeatherCounter],
dice_wether_init(S_wether_mode_pat01[env_light->dice_wether_counter],
S_wether_time_pat01[env_light->dice_wether_counter],
current_time);
break;
case 1:
dice_wether_init(S_wether_mode_pat02[env_light->mDiceWeatherCounter],
S_wether_time_pat02[env_light->mDiceWeatherCounter],
dice_wether_init(S_wether_mode_pat02[env_light->dice_wether_counter],
S_wether_time_pat02[env_light->dice_wether_counter],
current_time);
break;
case 2:
dice_wether_init(S_wether_mode_pat03[env_light->mDiceWeatherCounter],
S_wether_time_pat03[env_light->mDiceWeatherCounter],
dice_wether_init(S_wether_mode_pat03[env_light->dice_wether_counter],
S_wether_time_pat03[env_light->dice_wether_counter],
current_time);
break;
case 3:
dice_wether_init(S_wether_mode_pat04[env_light->mDiceWeatherCounter],
S_wether_time_pat04[env_light->mDiceWeatherCounter],
dice_wether_init(S_wether_mode_pat04[env_light->dice_wether_counter],
S_wether_time_pat04[env_light->dice_wether_counter],
current_time);
break;
case 4:
dice_wether_init(S_wether_mode_pat05[env_light->mDiceWeatherCounter],
S_wether_time_pat05[env_light->mDiceWeatherCounter],
dice_wether_init(S_wether_mode_pat05[env_light->dice_wether_counter],
S_wether_time_pat05[env_light->dice_wether_counter],
current_time);
break;
}
env_light->mDiceWeatherCounter++;
env_light->mDiceWeatherState++;
env_light->dice_wether_counter++;
env_light->dice_wether_state++;
}
break;
case DICE_STATE_EXEC_e:
if (current_time > env_light->mDiceWeatherTime &&
current_time - env_light->mDiceWeatherTime < 180.0f)
if (current_time > env_light->dice_wether_time &&
current_time - env_light->dice_wether_time < 180.0f)
{
switch (env_light->mDiceWeatherCurrPattern) {
switch (env_light->dice_wether_pat) {
case 0:
dice_wether_execute(S_wether_mode_pat01[env_light->mDiceWeatherCounter],
S_wether_time_pat01[env_light->mDiceWeatherCounter],
dice_wether_execute(S_wether_mode_pat01[env_light->dice_wether_counter],
S_wether_time_pat01[env_light->dice_wether_counter],
current_time);
break;
case 1:
dice_wether_execute(S_wether_mode_pat02[env_light->mDiceWeatherCounter],
S_wether_time_pat02[env_light->mDiceWeatherCounter],
dice_wether_execute(S_wether_mode_pat02[env_light->dice_wether_counter],
S_wether_time_pat02[env_light->dice_wether_counter],
current_time);
break;
case 2:
dice_wether_execute(S_wether_mode_pat03[env_light->mDiceWeatherCounter],
S_wether_time_pat03[env_light->mDiceWeatherCounter],
dice_wether_execute(S_wether_mode_pat03[env_light->dice_wether_counter],
S_wether_time_pat03[env_light->dice_wether_counter],
current_time);
break;
case 3:
dice_wether_execute(S_wether_mode_pat04[env_light->mDiceWeatherCounter],
S_wether_time_pat04[env_light->mDiceWeatherCounter],
dice_wether_execute(S_wether_mode_pat04[env_light->dice_wether_counter],
S_wether_time_pat04[env_light->dice_wether_counter],
current_time);
break;
case 4:
dice_wether_execute(S_wether_mode_pat05[env_light->mDiceWeatherCounter],
S_wether_time_pat05[env_light->mDiceWeatherCounter],
dice_wether_execute(S_wether_mode_pat05[env_light->dice_wether_counter],
S_wether_time_pat05[env_light->dice_wether_counter],
current_time);
break;
}
@@ -186,24 +186,24 @@ static void dKy_event_proc() {
break;
case DICE_STATE_NEXT_e:
u8 time_table_no = cM_rndF(7.99f);
env_light->mDiceWeatherChangeTime = current_time + S_time_table[time_table_no];
env_light->dice_wether_change_time = current_time + S_time_table[time_table_no];
if (env_light->mDiceWeatherChangeTime >= 360.0f) {
env_light->mDiceWeatherChangeTime -= 360.0f;
if (env_light->dice_wether_change_time >= 360.0f) {
env_light->dice_wether_change_time -= 360.0f;
}
env_light->mDiceWeatherState = DICE_STATE_RESET_e;
env_light->dice_wether_state = DICE_STATE_RESET_e;
break;
}
if (g_env_light.field_0x130b == 1) {
env_light->mDiceWeatherMode = DICE_MODE_UNK6_e;
env_light->dice_wether_mode = DICE_MODE_UNK6_e;
}
if (g_env_light.mColPatMode == 0 && g_env_light.mColPatModeGather == 0) {
u8 weather_colpat;
switch (env_light->mDiceWeatherMode) {
switch (env_light->dice_wether_mode) {
case DICE_MODE_SUNNY_e:
weather_colpat = 0;
if (g_env_light.mThunderEff.mMode == 1) {
@@ -219,21 +219,21 @@ static void dKy_event_proc() {
break;
case DICE_MODE_RAIN_LIGHT_e:
weather_colpat = 1;
if (env_light->mRainCount < 40) {
env_light->mRainCount++;
dKyw_rain_set(env_light->mRainCount);
if (env_light->raincnt < 40) {
env_light->raincnt++;
dKyw_rain_set(env_light->raincnt);
} else {
env_light->mRainCount--;
dKyw_rain_set(env_light->mRainCount);
env_light->raincnt--;
dKyw_rain_set(env_light->raincnt);
}
break;
case DICE_MODE_THUNDER_HEAVY_e:
g_env_light.mThunderEff.mMode = 1;
case DICE_MODE_RAIN_HEAVY_e:
weather_colpat = 2;
if (env_light->mRainCount < 250) {
env_light->mRainCount++;
dKyw_rain_set(env_light->mRainCount);
if (env_light->raincnt < 250) {
env_light->raincnt++;
dKyw_rain_set(env_light->raincnt);
}
break;
case DICE_MODE_THUNDER_LIGHT_e:
@@ -247,13 +247,13 @@ static void dKy_event_proc() {
g_env_light.mThunderEff.mMode = 0;
}
if (env_light->mRainCount > 2) {
env_light->mRainCount -= 2;
if (env_light->raincnt > 2) {
env_light->raincnt -= 2;
} else {
env_light->mRainCount = 0;
env_light->raincnt = 0;
}
dKyw_rain_set(env_light->mRainCount);
dKyw_rain_set(env_light->raincnt);
}
if (env_light->mColpatWeather != weather_colpat) {
@@ -264,7 +264,7 @@ static void dKy_event_proc() {
if (g_env_light.mColPatMode == 0 && g_env_light.mColPatModeGather == 0 &&
g_env_light.mColpatCurrGather != 0xFF &&
g_env_light.mColPatCurr != g_env_light.mColpatCurrGather)
g_env_light.wether_pat1 != g_env_light.mColpatCurrGather)
{
g_env_light.mColPatBlendGather = 0.0f;
}
@@ -328,12 +328,12 @@ static void daKytag06_lv7_boss_wether_proc(kytag06_class* i_this, u8 param_1) {
switch (param_1) {
case 0:
weather_colpat = 0;
if (env_light->mRainCount > 20) {
env_light->mRainCount -= 4;
} else if (env_light->mRainCount != 0) {
env_light->mRainCount--;
if (env_light->raincnt > 20) {
env_light->raincnt -= 4;
} else if (env_light->raincnt != 0) {
env_light->raincnt--;
}
dKyw_rain_set(env_light->mRainCount);
dKyw_rain_set(env_light->raincnt);
break;
case 1:
weather_colpat = 1;
@@ -341,16 +341,16 @@ static void daKytag06_lv7_boss_wether_proc(kytag06_class* i_this, u8 param_1) {
break;
case 2:
weather_colpat = 2;
if (env_light->mRainCount < 250) {
env_light->mRainCount++;
dKyw_rain_set(env_light->mRainCount);
if (env_light->raincnt < 250) {
env_light->raincnt++;
dKyw_rain_set(env_light->raincnt);
}
g_env_light.mThunderEff.mMode = 1;
break;
}
if (env_light->mColpatWeather != weather_colpat && !g_env_light.mCameraInWater) {
if (env_light->mColpatWeather != weather_colpat && !g_env_light.camera_water_in_status) {
g_env_light.mColpatWeather = weather_colpat;
dKy_change_colpat(weather_colpat);
}
@@ -458,12 +458,12 @@ static void daKytag06_wether_proc(kytag06_class* i_this, u8 param_1) {
if ((g_Counter.mCounter0 & 3) == 0) {
// run block every 4 frames
if (env_light->mRainCount < 40) {
env_light->mRainCount++;
dKyw_rain_set(env_light->mRainCount);
if (env_light->raincnt < 40) {
env_light->raincnt++;
dKyw_rain_set(env_light->raincnt);
} else {
env_light->mRainCount--;
dKyw_rain_set(env_light->mRainCount);
env_light->raincnt--;
dKyw_rain_set(env_light->raincnt);
}
}
@@ -474,9 +474,9 @@ static void daKytag06_wether_proc(kytag06_class* i_this, u8 param_1) {
case 3:
weather_colpat = 1;
if (env_light->mRainCount < 250) {
env_light->mRainCount++;
dKyw_rain_set(env_light->mRainCount);
if (env_light->raincnt < 250) {
env_light->raincnt++;
dKyw_rain_set(env_light->raincnt);
}
if (env_light->mSnowCount != 0) {
@@ -487,9 +487,9 @@ static void daKytag06_wether_proc(kytag06_class* i_this, u8 param_1) {
g_env_light.mThunderEff.mMode = 1;
weather_colpat = 1;
if (env_light->mRainCount < 250) {
env_light->mRainCount++;
dKyw_rain_set(env_light->mRainCount);
if (env_light->raincnt < 250) {
env_light->raincnt++;
dKyw_rain_set(env_light->raincnt);
}
if (env_light->mSnowCount != 0) {
@@ -527,7 +527,7 @@ static void daKytag06_wether_proc(kytag06_class* i_this, u8 param_1) {
break;
}
if (env_light->mColpatWeather != weather_colpat && !g_env_light.mCameraInWater) {
if (env_light->mColpatWeather != weather_colpat && !g_env_light.camera_water_in_status) {
g_env_light.mColpatWeather = weather_colpat;
dKy_change_colpat(weather_colpat);
}
@@ -608,13 +608,13 @@ static void daKytag06_type_07_Execute(kytag06_class* i_this) {
if (camera != NULL) {
if (camera->lookat.eye.y > 0.0f) {
dKy_BossLight_set(&spX, &color, i_this->mWindPower * 2.0f, 0);
g_env_light.mTerrainAmbienceBG[3].r = (u8)(i_this->mWindPower * 230.0f + 25.0f);
g_env_light.mTerrainAmbienceBG[3].g = (u8)(i_this->mWindPower * 215.0f + 30.0f);
g_env_light.mTerrainAmbienceBG[3].b = (u8)(i_this->mWindPower * 155.0f + 25.0f);
g_env_light.bg_amb_col[3].r = (u8)(i_this->mWindPower * 230.0f + 25.0f);
g_env_light.bg_amb_col[3].g = (u8)(i_this->mWindPower * 215.0f + 30.0f);
g_env_light.bg_amb_col[3].b = (u8)(i_this->mWindPower * 155.0f + 25.0f);
} else {
g_env_light.mTerrainAmbienceBG[3].r = 0;
g_env_light.mTerrainAmbienceBG[3].g = 0;
g_env_light.mTerrainAmbienceBG[3].b = 0;
g_env_light.bg_amb_col[3].r = 0;
g_env_light.bg_amb_col[3].g = 0;
g_env_light.bg_amb_col[3].b = 0;
g_env_light.mThunderEff.mMode = 0;
}
}
@@ -776,9 +776,9 @@ static void daKytag06_type_06_Execute(kytag06_class* i_this) {
break;
}
g_env_light.mTerrainAmbienceBG[3].r = (u8)(i_this->mWindPower * 245.0f + 10.0f);
g_env_light.mTerrainAmbienceBG[3].g = (u8)(i_this->mWindPower * 185.0f + 15.0f);
g_env_light.mTerrainAmbienceBG[3].b = (u8)(i_this->mWindPower * 130.0f + 20.0f);
g_env_light.bg_amb_col[3].r = (u8)(i_this->mWindPower * 245.0f + 10.0f);
g_env_light.bg_amb_col[3].g = (u8)(i_this->mWindPower * 185.0f + 15.0f);
g_env_light.bg_amb_col[3].b = (u8)(i_this->mWindPower * 130.0f + 20.0f);
static cXyz c_pos(0.0f, 0.0f, 0.0f);
@@ -967,8 +967,8 @@ static void daKytag06_type_03_Execute(kytag06_class* i_this) {
case 2:
if ((g_Counter.mCounter0 & 7) == 0) {
// run block every 8 frames
if (g_env_light.mRainCount < 250) {
g_env_light.mRainCount++;
if (g_env_light.raincnt < 250) {
g_env_light.raincnt++;
} else {
i_this->mMode++;
}
@@ -1103,8 +1103,8 @@ static int daKytag06_Execute(kytag06_class* i_this) {
break;
case 2:
if (i_this->field_0x578 > 900) {
if (g_env_light.mRainCount < 250) {
g_env_light.mRainCount++;
if (g_env_light.raincnt < 250) {
g_env_light.raincnt++;
} else {
i_this->field_0x591++;
}
@@ -1129,8 +1129,8 @@ static int daKytag06_Execute(kytag06_class* i_this) {
if (i_this->field_0x578 > 0) {
g_env_light.mThunderEff.mMode = 0;
if (g_env_light.mRainCount > 0) {
g_env_light.mRainCount--;
if (g_env_light.raincnt > 0) {
g_env_light.raincnt--;
} else {
i_this->field_0x591++;
}
@@ -1251,10 +1251,10 @@ static void daKytag06_type03_init(fopAc_ac_c* i_this) {
if (dComIfGs_isSwitch(a_this->mSwNo, stayNo)) {
a_this->mMode = 9;
g_env_light.mRainCount = 250;
g_env_light.raincnt = 250;
g_env_light.mColpatWeather = a_this->field_0x591;
g_env_light.mColPatPrev = a_this->field_0x591;
g_env_light.mColPatCurr = a_this->field_0x591;
g_env_light.wether_pat0 = a_this->field_0x591;
g_env_light.wether_pat1 = a_this->field_0x591;
}
}
} else if (a_this->field_0x597 == 2 && dComIfGp_roomControl_getStayNo() != 0) {
@@ -1320,8 +1320,8 @@ static int daKytag06_Create(fopAc_ac_c* i_this) {
default:
if (strcmp(dComIfGp_getStartStageName(), "T_MUKAO") != 0) {
g_env_light.mColpatWeather = 3;
g_env_light.mColPatPrev = 3;
g_env_light.mColPatCurr = 3;
g_env_light.wether_pat0 = 3;
g_env_light.wether_pat1 = 3;
} else {
dComIfGs_setTime(210.0f);
}
src/d/actor/d_a_kytag08.cpp
+1 -1
View File
@@ -267,7 +267,7 @@ static int daKytag08_Create(fopAc_ac_c* i_this) {
a_this->mAvoidPos.y = 100.0f;
a_this->mTargetAvoidPos = a_this->mAvoidPos;
env_light->field_0x1060 = a_this;
env_light->fog_avoid_tag = a_this;
}
return phase;
src/d/actor/d_a_kytag11.cpp
+7 -7
View File
@@ -48,17 +48,17 @@ static int daKytag11_Execute(kytag11_class* i_this) {
if (!i_this->mInitTimeChange) {
if (i_this->mNewTime != 0x1F) {
env_light->mDaytime = dComIfGs_getTime();
env_light->daytime = dComIfGs_getTime();
f32 new_time = i_this->mNewTime * 15.0f;
env_light->mDaytime = new_time;
env_light->daytime = new_time;
dComIfGs_setTime(new_time);
}
i_this->mInitTimeChange = true;
}
env_light->field_0x12fb = 1;
env_light->using_time_control_tag = 1;
if (i_this->mStopTime != 0x1F && i_this->mStopTime == (u8)dKy_getdaytime_hour()) {
return 1;
@@ -67,19 +67,19 @@ static int daKytag11_Execute(kytag11_class* i_this) {
f32 new_env_time = ((i_this->mEnvTime / 255.0f) * 0.5f);
f32 current_time = dComIfGs_getTime();
env_light->mDaytime = current_time;
env_light->daytime = current_time;
env_light->mDate = dComIfGs_getDate();
new_env_time = current_time + new_env_time;
env_light->mDaytime = new_env_time;
env_light->daytime = new_env_time;
if ((u32)new_env_time >= 360.0f) {
env_light->mDaytime = 0.0f;
env_light->daytime = 0.0f;
env_light->mDate++;
dKankyo_DayProc();
}
dComIfGs_setTime(env_light->mDaytime);
dComIfGs_setTime(env_light->daytime);
dComIfGs_setDate(env_light->mDate);
return 1;
src/d/actor/d_a_kytag12.cpp
+9 -9
View File
@@ -278,9 +278,9 @@ static int daKytag12_Execute_standard(kytag12_class* i_this) {
}
for (int j = 0; j < 10; j++) {
if (g_env_light.mDalkmistInf[j] != NULL &&
g_env_light.mDalkmistInf[j]->mPos.abs(effect_p->mBasePos) <
g_env_light.mDalkmistInf[j]->field_0xc + 100.0f)
if (g_env_light.dalkmist_influence[j] != NULL &&
g_env_light.dalkmist_influence[j]->mPos.abs(effect_p->mBasePos) <
g_env_light.dalkmist_influence[j]->field_0xc + 100.0f)
{
if (effect_p->mStatus != 2 && effect_p->field_0x40 == 0 && var_r23 < 1) {
cXyz spF4;
@@ -587,9 +587,9 @@ static int daKytag12_Execute_arrival(kytag12_class* i_this) {
}
for (int j = 0; j < 10; j++) {
if (g_env_light.mDalkmistInf[j] != NULL &&
g_env_light.mDalkmistInf[j]->mPos.abs(effect_p->mBasePos) <
g_env_light.mDalkmistInf[j]->field_0xc + 100.0f)
if (g_env_light.dalkmist_influence[j] != NULL &&
g_env_light.dalkmist_influence[j]->mPos.abs(effect_p->mBasePos) <
g_env_light.dalkmist_influence[j]->field_0xc + 100.0f)
{
if (effect_p->mStatus != 3 && effect_p->field_0x40 == 0 && var_r21 < 1) {
sp80 = effect_p->mBasePos;
@@ -892,9 +892,9 @@ static int daKytag12_Execute_R00(kytag12_class* i_this) {
}
for (int j = 0; j < 10; j++) {
if (g_env_light.mDalkmistInf[j] != NULL &&
g_env_light.mDalkmistInf[j]->mPos.abs(effect_p->mBasePos) <
g_env_light.mDalkmistInf[j]->field_0xc + 100.0f)
if (g_env_light.dalkmist_influence[j] != NULL &&
g_env_light.dalkmist_influence[j]->mPos.abs(effect_p->mBasePos) <
g_env_light.dalkmist_influence[j]->field_0xc + 100.0f)
{
if (effect_p->mStatus != 2 && effect_p->field_0x40 == 0 && var_r24 < 1) {
cXyz spA4;
src/d/actor/d_a_kytag15.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ static int daKytag15_Execute(kytag15_class* i_this) {
} else {
cLib_addCalc(&i_this->field_0x590, 0.0f, 0.05f, 0.01f, 1.0E-8f);
}
} else if (g_env_light.mColPatPrev == 11) {
} else if (g_env_light.wether_pat0 == 11) {
cLib_addCalc(&i_this->field_0x590, 1.0f, 0.05f, 0.01f, 1.0E-8f);
}
src/d/actor/d_a_kytag17.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ static int daKytag17_Create(fopAc_ac_c* i_this) {
fopAcM_SetupActor(a_this, kytag17_class);
a_this->mParameters = fopAcM_GetParam(a_this);
g_env_light.field_0x1308 = a_this->mParameters;
g_env_light.light_mask_type = a_this->mParameters;
return cPhs_COMPLEATE_e;
}
src/d/actor/d_a_midna.cpp
+11 -11
View File
@@ -1044,11 +1044,11 @@ void daMidna_c::setRoomInfo() {
int room_no;
if (fopAcM_gc_c::gndCheck(&current.pos)) {
room_no = fopAcM_gc_c::getRoomId();
tevStr.mEnvrIdxOverride = fopAcM_gc_c::getPolyColor();
tevStr.YukaCol = fopAcM_gc_c::getPolyColor();
} else {
room_no = dComIfGp_roomControl_getStayNo();
}
tevStr.mRoomNo = room_no;
tevStr.room_no = room_no;
mReverb = dComIfGp_getReverb(room_no);
fopAcM_SetRoomNo(this, room_no);
}
@@ -3266,12 +3266,12 @@ int daMidna_c::draw() {
if (checkSetAnime(0, ANM_RETURN)) {
f32 end_frame = mpMorf->getEndFrame();
f32 frame = mpMorf->getFrame();
tevStr.mFogColor.r = (frame / end_frame) * -32.0f;
tevStr.mFogColor.g = tevStr.mFogColor.r;
tevStr.mFogColor.b = tevStr.mFogColor.r;
tevStr.TevColor.r = (frame / end_frame) * -32.0f;
tevStr.TevColor.g = tevStr.TevColor.r;
tevStr.TevColor.b = tevStr.TevColor.r;
} else if (link->getIceDamageWaitTimer() != 0 || link->checkFreezeDamage() != 0) {
tevStr.mFogColor = link->tevStr.mFogColor;
field_0x6e0 = link->tevStr.mFogColor;
tevStr.TevColor = link->tevStr.TevColor;
field_0x6e0 = link->tevStr.TevColor;
if (dKy_darkworld_check()) {
field_0x6e8 = (J3DGXColor)l_normalKColor;
field_0x6ec = (J3DGXColor)l_normalKColor2;
@@ -3311,7 +3311,7 @@ int daMidna_c::draw() {
} else {
g_env_light.settingTevStruct(1, &current.pos, &tevStr);
if (field_0x668 != NULL) {
field_0x668->getTevColorReg(0, &tevStr.mFogColor);
field_0x668->getTevColorReg(0, &tevStr.TevColor);
}
g_env_light.setLightTevColorType_MAJI(mpGokouBmd, &tevStr);
mDoExt_modelEntryDL(mpGokouBmd);
@@ -3359,9 +3359,9 @@ int daMidna_c::draw() {
mDoExt_modelEntryDL(mpDemoHDTmpBmd);
}
tevStr.mFogColor.r = 0;
tevStr.mFogColor.g = 0;
tevStr.mFogColor.b = 0;
tevStr.TevColor.r = 0;
tevStr.TevColor.g = 0;
tevStr.TevColor.b = 0;
dComIfGd_setList();
if (bvar1 && !checkStateFlg1(FLG1_SHADOW_NO_DRAW)) {
src/d/actor/d_a_mirror.cpp
+4 -4
View File
@@ -207,10 +207,10 @@ void dMirror_packet_c::modelDraw(J3DModel* i_model, Mtx param_1) {
JUT_ASSERT(kankyo != 0);
GXColor color = {0};
color.r = kankyo->mTerrainAmbienceBG[0].r;
color.g = kankyo->mTerrainAmbienceBG[0].g;
color.b = kankyo->mTerrainAmbienceBG[0].b;
color.a = kankyo->mTerrainAmbienceBG[0].a;
color.r = kankyo->bg_amb_col[0].r;
color.g = kankyo->bg_amb_col[0].g;
color.b = kankyo->bg_amb_col[0].b;
color.a = kankyo->bg_amb_col[0].a;
J3DModelData* modelData = i_model->getModelData();
u16 materialNum = modelData->getMaterialNum();
src/d/actor/d_a_nbomb.cpp
+5 -5
View File
@@ -485,13 +485,13 @@ void daNbomb_c::setRoomInfo() {
int room_no;
if (mAcch.GetGroundH() != -1000000000.0f) {
room_no = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
mPolySound = dKy_pol_sound_get(&mAcch.m_gnd);
} else {
room_no = dComIfGp_roomControl_getStayNo();
}
tevStr.mRoomNo = room_no;
tevStr.room_no = room_no;
mSoundReverb = dComIfGp_getReverb(room_no);
mCcStts.SetRoomId(room_no);
fopAcM_SetRoomNo(this, room_no);
@@ -1679,9 +1679,9 @@ int daNbomb_c::draw() {
}
if (checkStateFlg0(FLG0_FROZEN)) {
tevStr.mFogColor.r = player->getFreezeR();
tevStr.mFogColor.g = player->getFreezeG();
tevStr.mFogColor.b = player->getFreezeB();
tevStr.TevColor.r = player->getFreezeR();
tevStr.TevColor.g = player->getFreezeG();
tevStr.TevColor.b = player->getFreezeB();
}
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
src/d/actor/d_a_npc.cpp
+26 -26
View File
@@ -1465,26 +1465,26 @@ int daNpcT_c::draw(int param_0, int i_setEffMtx, f32 param_2, GXColorS10* i_colo
return 1;
}
tevStr.mFogColor.r = 0;
tevStr.mFogColor.g = 0;
tevStr.mFogColor.b = 0;
tevStr.mFogColor.a = 0;
tevStr.TevColor.r = 0;
tevStr.TevColor.g = 0;
tevStr.TevColor.b = 0;
tevStr.TevColor.a = 0;
if (i_color != NULL) {
tevStr.mFogColor.r = i_color->r;
tevStr.mFogColor.g = i_color->g;
tevStr.mFogColor.b = i_color->b;
tevStr.mFogColor.a = i_color->a;
tevStr.TevColor.r = i_color->r;
tevStr.TevColor.g = i_color->g;
tevStr.TevColor.b = i_color->b;
tevStr.TevColor.a = i_color->a;
}
if (field_0xdb8 != 0 && mTimer != 0) {
f32 r = (f32)mTimer / (f32)field_0xdb8;
if (cM3d_IsZero(r) == false) {
tevStr.mFogColor.r = r * 20.0f;
tevStr.TevColor.r = r * 20.0f;
}
} else if (param_0 != 0) {
tevStr.mFogColor.g = 20;
tevStr.TevColor.g = 20;
}
if (field_0xd98 & 0x800) {
@@ -1555,8 +1555,8 @@ int daNpcT_c::draw(int param_0, int i_setEffMtx, f32 param_2, GXColorS10* i_colo
/* 80148C70-80148CCC 1435B0 005C+00 1/1 0/0 58/58 .text setEnvTevColor__8daNpcT_cFv */
void daNpcT_c::setEnvTevColor() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(field_0x930);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(field_0x930);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(field_0x930);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(field_0x930);
}
/* 80148CCC-80148D10 14360C 0044+00 1/1 0/0 58/58 .text setRoomNo__8daNpcT_cFv */
@@ -2861,8 +2861,8 @@ void daBaseNpc_c::mainProc() {
/* 8014F0A0-8014F0FC 1499E0 005C+00 1/1 0/0 2/2 .text setEnvTevColor__11daBaseNpc_cFv */
void daBaseNpc_c::setEnvTevColor() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mBgSPolyInfo);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mBgSPolyInfo);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mBgSPolyInfo);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mBgSPolyInfo);
}
/* 8014F0FC-8014F140 149A3C 0044+00 1/1 0/0 2/2 .text setRoomNo__11daBaseNpc_cFv */
@@ -3708,19 +3708,19 @@ int daNpcF_c::draw(BOOL i_isTest, BOOL param_1, f32 i_shadowDepth, _GXColorS10*
}
if (cM3d_IsZero_inverted(damage_ratio)) {
tevStr.mFogColor.r = (s16)(damage_ratio * 20.0f);
tevStr.mFogColor.g = 0;
tevStr.TevColor.r = (s16)(damage_ratio * 20.0f);
tevStr.TevColor.g = 0;
} else if (i_isTest) {
tevStr.mFogColor.g = 20;
tevStr.mFogColor.r = 0;
tevStr.TevColor.g = 20;
tevStr.TevColor.r = 0;
} else if (i_fogColor != NULL) {
tevStr.mFogColor.r = i_fogColor->r;
tevStr.mFogColor.g = i_fogColor->g;
tevStr.mFogColor.b = i_fogColor->b;
tevStr.mFogColor.a = i_fogColor->a;
tevStr.TevColor.r = i_fogColor->r;
tevStr.TevColor.g = i_fogColor->g;
tevStr.TevColor.b = i_fogColor->b;
tevStr.TevColor.a = i_fogColor->a;
} else {
tevStr.mFogColor.g = 0;
tevStr.mFogColor.r = 0;
tevStr.TevColor.g = 0;
tevStr.TevColor.r = 0;
}
if (mTwilight) {
@@ -4000,8 +4000,8 @@ BOOL daNpcF_c::setBrkAnm(J3DAnmTevRegKey* i_brk, J3DModelData* i_modelData, f32
/* 80152D84-80152DE0 14D6C4 005C+00 1/1 0/0 40/40 .text setEnvTevColor__8daNpcF_cFv */
void daNpcF_c::setEnvTevColor() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
}
/* 80152DE0-80152E24 14D720 0044+00 1/1 0/0 40/40 .text setRoomNo__8daNpcF_cFv */
src/d/actor/d_a_npc_cd.cpp
+3 -3
View File
@@ -674,8 +674,8 @@ int daNpcCd_c::removeResrc(int idx, int param_1) {
/* 80156D1C-80156D78 15165C 005C+00 0/0 0/0 1/1 .text setEnvTevCol__9daNpcCd_cFv */
void daNpcCd_c::setEnvTevCol() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
}
/* 80156D78-80156DBC 1516B8 0044+00 0/0 0/0 1/1 .text setRoomNo__9daNpcCd_cFv */
@@ -1485,4 +1485,4 @@ void __sinit_d_a_npc_cd_cpp(){// NONMATCHING
REGISTER_CTORS(0x80157A10, __sinit_d_a_npc_cd_cpp);
#pragma pop
/* 80392FE8-80392FE8 01F648 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 80392FE8-80392FE8 01F648 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_npc_cd2.cpp
+3 -3
View File
@@ -1783,8 +1783,8 @@ int daNpcCd2_c::removeResrc(int idx, int param_1) {
/* 80158D88-80158DE4 1536C8 005C+00 0/0 0/0 4/4 .text setEnvTevCol__10daNpcCd2_cFv */
void daNpcCd2_c::setEnvTevCol() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
}
/* 80158DE4-80158E28 153724 0044+00 0/0 0/0 4/4 .text setRoomNo__10daNpcCd2_cFv */
@@ -2164,4 +2164,4 @@ void __sinit_d_a_npc_cd2_cpp(){// NONMATCHING
#pragma push
#pragma force_active on
REGISTER_CTORS(0x8015A90C, __sinit_d_a_npc_cd2_cpp);
#pragma pop
#pragma pop
src/d/actor/d_a_npc_fish.cpp
+4 -4
View File
@@ -35,7 +35,7 @@ static void fish_set(fopAc_ac_c* i_this, fish_data_s* data) {
}
u32 param = data->param;
pos = data->pos;
if ((param == 1u) && envLight->mPondSeason != 2) {
if ((param == 1u) && envLight->fishing_hole_season != 2) {
param = 2;
}
param |= data->field_0x10 << 8;
@@ -138,9 +138,9 @@ static int daNpc_Fish_Create(fopAc_ac_c* i_this) {
} else {
dScnKy_env_light_c* envLight = dKy_getEnvlight();
s32 param = 0;
if (envLight->mPondSeason == 2) {
if (envLight->fishing_hole_season == 2) {
param = 160;
} else if (envLight->mPondSeason == 3) {
} else if (envLight->fishing_hole_season == 3) {
param = 64;
}
if (param != 0) {
@@ -149,7 +149,7 @@ static int daNpc_Fish_Create(fopAc_ac_c* i_this) {
NULL, -1);
}
}
if (g_env_light.mPondSeason == 2) {
if (g_env_light.fishing_hole_season == 2) {
for (int i = 0; i < 4; i++) {
pos.set(cM_rndFX(700.0f) + -2936.0f, 0.0f, cM_rndFX(700.0f) + -7865.0f);
csXyz angle(0, 0, -1);
src/d/actor/d_a_npc_zrz.cpp
+35 -35
View File
@@ -450,22 +450,22 @@ int daNpc_zrZ_c::draw(int i_isTest, int param_1, f32 i_shadowDepth, _GXColorS10*
}
if (cM3d_IsZero_inverted(damage_ratio)) {
tevStr.mFogColor.r = (s16)(damage_ratio * 20.0f);
tevStr.mFogColor.g = 0;
tevStr.TevColor.r = (s16)(damage_ratio * 20.0f);
tevStr.TevColor.g = 0;
} else if (i_isTest) {
tevStr.mFogColor.g = 20;
tevStr.mFogColor.r = 0;
tevStr.TevColor.g = 20;
tevStr.TevColor.r = 0;
} else if (i_fogColor != NULL) {
tevStr.mFogColor.r = i_fogColor->r;
tevStr.mFogColor.g = i_fogColor->g;
tevStr.mFogColor.b = i_fogColor->b;
tevStr.mFogColor.a = i_fogColor->a;
tevStr.TevColor.r = i_fogColor->r;
tevStr.TevColor.g = i_fogColor->g;
tevStr.TevColor.b = i_fogColor->b;
tevStr.TevColor.a = i_fogColor->a;
} else {
tevStr.mFogColor.g = 0;
tevStr.mFogColor.r = 0;
tevStr.TevColor.g = 0;
tevStr.TevColor.r = 0;
}
if (tevStr.mFogColor.a == 0) {
if (tevStr.TevColor.a == 0) {
return 1;
}
@@ -656,7 +656,7 @@ void daNpc_zrZ_c::setParam() {
mAcchCir.SetWallH(daNpc_zrZ_Param_c::m.mWallH);
gravity = daNpc_zrZ_Param_c::m.mGravity;
u32 uvar4 = cLib_minMaxLimit<u32>(tevStr.mFogColor.a * 100 / 0xff, 1, 100);
u32 uvar4 = cLib_minMaxLimit<u32>(tevStr.TevColor.a * 100 / 0xff, 1, 100);
mCreatureSound.startCreatureSoundLevel(Z2SE_ZRZ_MV, uvar4, -1);
}
@@ -1053,14 +1053,14 @@ void daNpc_zrZ_c::reset() {
if (mDemoMode == DEMO_WAIT) {
mIsLeading = false;
tevStr.mFogColor.a = 0;
tevStr.TevColor.a = 0;
mpNextActionFn = &wait;
} else if (mDemoMode == DEMO_COME_HERE || mDemoMode == DEMO_COME_HERE_2) {
mIsLeading = false;
tevStr.mFogColor.a = 0xff;
tevStr.TevColor.a = 0xff;
} else {
mIsLeading = true;
tevStr.mFogColor.a = 0xff;
tevStr.TevColor.a = 0xff;
}
setLookMode(LOOK_NONE);
@@ -1688,20 +1688,20 @@ BOOL daNpc_zrZ_c::ECut_helpPrince(int i_staffID) {
case 40:
if (cLib_calcTimer(&mEventTimer) == 0) {
ret = true;
tevStr.mFogColor.a = 0xff;
tevStr.TevColor.a = 0xff;
} else {
tevStr.mFogColor.a = (u8)((60 - mEventTimer) / 60.0f * 255.0f);
tevStr.TevColor.a = (u8)((60 - mEventTimer) / 60.0f * 255.0f);
}
break;
case 103:
if (cLib_calcTimer(&mEventTimer) == 0) {
ret = true;
tevStr.mFogColor.a = 0;
tevStr.TevColor.a = 0;
} else if (mEventTimer > 30) {
tevStr.mFogColor.a = (u8)((mEventTimer - 30) / 30.0f * 255.0f);
tevStr.TevColor.a = (u8)((mEventTimer - 30) / 30.0f * 255.0f);
} else {
tevStr.mFogColor.a = 0;
tevStr.TevColor.a = 0;
}
break;
@@ -1988,11 +1988,11 @@ BOOL daNpc_zrZ_c::ECut_clothesGet(int i_staffID) {
case 90:
if (cLib_calcTimer(&mEventTimer) == 0) {
ret = true;
tevStr.mFogColor.a = 0;
tevStr.TevColor.a = 0;
} else if (mEventTimer > 0) {
tevStr.mFogColor.a = (u8)(mEventTimer / 120.0f * 255.0f);
tevStr.TevColor.a = (u8)(mEventTimer / 120.0f * 255.0f);
} else {
tevStr.mFogColor.a = 0;
tevStr.TevColor.a = 0;
}
break;
@@ -2074,11 +2074,11 @@ BOOL daNpc_zrZ_c::ECut_getAfter(int i_staffID) {
case 90:
if (cLib_calcTimer(&mEventTimer) == 0) {
ret = true;
tevStr.mFogColor.a = 0;
tevStr.TevColor.a = 0;
} else if (mEventTimer > 0) {
tevStr.mFogColor.a = (u8)(mEventTimer / 120.0f * 255.0f);
tevStr.TevColor.a = (u8)(mEventTimer / 120.0f * 255.0f);
} else {
tevStr.mFogColor.a = 0;
tevStr.TevColor.a = 0;
}
break;
@@ -2131,7 +2131,7 @@ BOOL daNpc_zrZ_c::ECut_sealRelease(int i_staffID) {
break;
case 10:
if (tevStr.mFogColor.a <= 0x1e) {
if (tevStr.TevColor.a <= 0x1e) {
ret = true;
}
break;
@@ -2150,7 +2150,7 @@ BOOL daNpc_zrZ_c::ECut_sealRelease(int i_staffID) {
if (prm >= 10) {
cXyz pos = mPath.getPntPos(mPath.getIdx());
if (!mPath.chkPassedDst(current.pos)) {
cLib_chaseS(&tevStr.mFogColor.a, 8, 8);
cLib_chaseS(&tevStr.TevColor.a, 8, 8);
cLib_addCalc2(&mSpeed, daNpc_zrZ_Param_c::m.mMaxSpeed, 0.1f, 1.0f);
s16 ang_y = cLib_targetAngleY(&current.pos, &pos);
s16 ang_x = cLib_targetAngleX(&pos, &current.pos);
@@ -2158,7 +2158,7 @@ BOOL daNpc_zrZ_c::ECut_sealRelease(int i_staffID) {
cLib_addCalcAngleS2(&mMoveAngle.x, ang_x, 2, 0x800);
} else {
mSpeed = 0.0f;
cLib_chaseS(&tevStr.mFogColor.a, 0xff, 8);
cLib_chaseS(&tevStr.TevColor.a, 0xff, 8);
mIsMoving = false;
}
} else {
@@ -2191,7 +2191,7 @@ BOOL daNpc_zrZ_c::ECut_srSkip(int i_staffID) {
current.pos = mPath.getPntPos(mPath.getIdx());
old.pos = current.pos;
setAngle(fopAcM_searchPlayerAngleY(this));
tevStr.mFogColor.a = 0xff;
tevStr.TevColor.a = 0xff;
mIsMoving = false;
if (mpRockActor != NULL) {
fopAcM_delete(mpRockActor);
@@ -2344,8 +2344,8 @@ BOOL daNpc_zrZ_c::comeHere(void* param_0) {
if (!dComIfGs_isSwitch(mSwitch1, fopAcM_GetRoomNo(this))) {
dComIfGs_onSwitch(mSwitch1, fopAcM_GetRoomNo(this));
}
cLib_chaseS(&tevStr.mFogColor.a, 0, 4);
if (tevStr.mFogColor.a == 0) {
cLib_chaseS(&tevStr.TevColor.a, 0, 4);
if (tevStr.TevColor.a == 0) {
fopAcM_delete(this);
}
}
@@ -2446,10 +2446,10 @@ BOOL daNpc_zrZ_c::comeHere2(void* param_0) {
mOrderEvtNo = EVT_SEAL_RELEASE;
break;
} else {
cLib_chaseS(&tevStr.mFogColor.a, 0x14, 8);
cLib_chaseS(&tevStr.TevColor.a, 0x14, 8);
}
} else {
cLib_chaseS(&tevStr.mFogColor.a, 0xff, 8);
cLib_chaseS(&tevStr.TevColor.a, 0xff, 8);
}
cLib_addCalc2(&mSpeed, daNpc_zrZ_Param_c::m.mMaxSpeed, 0.1f, 1.0f);
@@ -2459,7 +2459,7 @@ BOOL daNpc_zrZ_c::comeHere2(void* param_0) {
cLib_addCalcAngleS2(&mMoveAngle.x, angle_x, 2, 0x800);
} else {
cLib_chaseF(&mSpeed, 0.0f, 3.0f);
cLib_chaseS(&tevStr.mFogColor.a, 0xff, 8);
cLib_chaseS(&tevStr.TevColor.a, 0xff, 8);
}
cXyz move_speed(0.0f, 0.0f, mSpeed);
src/d/actor/d_a_obj_automata.cpp
+2 -2
View File
@@ -264,8 +264,8 @@ int daObj_AutoMata_c::setAnm(int param_1, bool param_2) {
/* 80BA6634-80BA6690 001034 005C+00 2/2 0/0 0/0 .text setEnvTevColor__16daObj_AutoMata_cFv */
void daObj_AutoMata_c::setEnvTevColor() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
}
/* 80BA6690-80BA66D4 001090 0044+00 2/2 0/0 0/0 .text setRoomNo__16daObj_AutoMata_cFv */
src/d/actor/d_a_obj_bed.cpp
+2 -2
View File
@@ -146,8 +146,8 @@ int daObj_Bed_c::isDelete() {
/* 80BADF34-80BADF90 0009B4 005C+00 2/2 0/0 0/0 .text setEnvTevColor__11daObj_Bed_cFv */
void daObj_Bed_c::setEnvTevColor() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
}
/* 80BADF90-80BADFD0 000A10 0040+00 2/2 0/0 0/0 .text setRoomNo__11daObj_Bed_cFv */
src/d/actor/d_a_obj_bombf.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ int daObjBombf_c::create() {
}
fopAcM_SetMtx(this, field_0x570->getBaseTRMtx());
tevStr.mRoomNo = fopAcM_GetRoomNo(this);
tevStr.room_no = fopAcM_GetRoomNo(this);
attention_info.position = current.pos;
eyePos = attention_info.position;
field_0x574 = 0xffffffff;
src/d/actor/d_a_obj_boumato.cpp
+2 -2
View File
@@ -315,8 +315,8 @@ void daObj_BouMato_c::setSwayParam(fopAc_ac_c* param_1) {
/* 80BBC19C-80BBC1F8 00129C 005C+00 2/2 0/0 0/0 .text setEnvTevColor__15daObj_BouMato_cFv
*/
void daObj_BouMato_c::setEnvTevColor() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
}
/* 80BBC1F8-80BBC23C 0012F8 0044+00 2/2 0/0 0/0 .text setRoomNo__15daObj_BouMato_cFv */
src/d/actor/d_a_obj_carry.cpp
+1 -1
View File
@@ -2579,7 +2579,7 @@ s32 daObjCarry_c::CreateInit_ironball() {
eyePos = current.pos;
fopAcM_SetRoomNo(this,getRoomNo(l_saveID));
tevStr.mRoomNo = fopAcM_GetRoomNo(this);
tevStr.room_no = fopAcM_GetRoomNo(this);
if (chkSttsFlag(l_saveID,1)) {
mDraw = 1;
src/d/actor/d_a_obj_cdoor.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ cPhs__Step daObjCdoor_c::create() {
return cPhs_ERROR_e;
}
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
tevStr.mRoomNo = dStage_roomControl_c::mStayNo;
tevStr.room_no = dStage_roomControl_c::mStayNo;
fopAcM_setCullSizeBox2(this, mpModel->getModelData());
mSw = fopAcM_GetParam(this) & 0xff;
mChainID = -1;
src/d/actor/d_a_obj_crope.cpp
+1 -1
View File
@@ -310,7 +310,7 @@ int daObjCrope_c::create() {
mCcStts.SetRoomId(fopAcM_GetRoomNo(this));
mCollider.Set(l_sphSrc);
mCollider.SetStts(&mCcStts);
tevStr.mRoomNo = fopAcM_GetRoomNo(this);
tevStr.room_no = fopAcM_GetRoomNo(this);
gravity = -5.0f;
cXyz cStack_68;
cXyz cStack_74;
src/d/actor/d_a_obj_digplace.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ int daObjDigpl_c::create() {
attention_info.position = current.pos;
eyePos = attention_info.position;
tevStr.mRoomNo = dComIfGp_roomControl_getStayNo();
tevStr.room_no = dComIfGp_roomControl_getStayNo();
fopAcM_SetMin(this, -550.0f, -250.0f, -550.0f);
fopAcM_SetMax(this, 550.0f, 250.0f, 550.0f);
attention_info.distances[fopAc_attn_ETC_e] = 27;
src/d/actor/d_a_obj_fchain.cpp
+5 -5
View File
@@ -39,7 +39,7 @@ int daObjFchain_c::create() {
0x10) == 0) {
return cPhs_ERROR_e;
}
tevStr.mRoomNo = dComIfGp_roomControl_getStayNo();
tevStr.room_no = dComIfGp_roomControl_getStayNo();
mShape.setUserArea((u32)this);
current.pos.y += 3.0f;
s16 local_58 = shape_angle.y;
@@ -283,10 +283,10 @@ void daObjFchain_shape_c::draw() {
material->loadSharedDL();
material->getShape()->loadPreDrawSetting();
GXColor ambColor;
ambColor.r = tevStr->mColorC0.r;
ambColor.g = tevStr->mColorC0.g;
ambColor.b = tevStr->mColorC0.b;
ambColor.a = tevStr->mColorC0.a;
ambColor.r = tevStr->AmbCol.r;
ambColor.g = tevStr->AmbCol.g;
ambColor.b = tevStr->AmbCol.b;
ambColor.a = tevStr->AmbCol.a;
GXSetChanAmbColor(GX_COLOR0A0, ambColor);
GXSetChanMatColor(GX_COLOR0A0, g_whiteColor);
dKy_setLight_again();
src/d/actor/d_a_obj_gra_rock.cpp
+2 -2
View File
@@ -93,8 +93,8 @@ void daObjGraRock_c::bombParticleSet() {
/* 80C11730-80C1178C 0006B0 005C+00 1/1 0/0 0/0 .text setEnvTevColor__14daObjGraRock_cFv
*/
void daObjGraRock_c::setEnvTevColor() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
}
/* 80C1178C-80C117D0 00070C 0044+00 1/1 0/0 0/0 .text setRoomNo__14daObjGraRock_cFv */
src/d/actor/d_a_obj_grave_stone.cpp
+2 -2
View File
@@ -118,8 +118,8 @@ int daGraveStone_c::setPrtcl() {
/* 80C12A38-80C12A94 0004B8 005C+00 2/2 0/0 0/0 .text setEnvTevColor__14daGraveStone_cFv
*/
void daGraveStone_c::setEnvTevColor() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
}
/* 80C12A94-80C12AD8 000514 0044+00 2/2 0/0 0/0 .text setRoomNo__14daGraveStone_cFv */
src/d/actor/d_a_obj_movebox.cpp
+2 -2
View File
@@ -1180,8 +1180,8 @@ int daObjMovebox::Act_c::Execute(Mtx** param_0) {
mBgc.proc_vertical(this);
if (mBgc.field_0x5c >= 0) {
tevStr.mRoomNo = current.roomNo;
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mBgc.M_gnd_work[mBgc.field_0x5c]);
tevStr.room_no = current.roomNo;
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mBgc.M_gnd_work[mBgc.field_0x5c]);
}
if (field_0x8fc > 0) {
src/d/actor/d_a_obj_oiltubo.cpp
+2 -2
View File
@@ -240,8 +240,8 @@ void daObj_Oiltubo_c::setParam() {
/* 80CA7318-80CA7374 000C78 005C+00 2/2 0/0 0/0 .text setEnvTevColor__15daObj_Oiltubo_cFv
*/
void daObj_Oiltubo_c::setEnvTevColor() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGroundChk);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGroundChk);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGroundChk);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGroundChk);
}
/* 80CA7374-80CA73B8 000CD4 0044+00 2/2 0/0 0/0 .text setRoomNo__15daObj_Oiltubo_cFv */
src/d/actor/d_a_obj_pleaf.cpp
+2 -2
View File
@@ -122,8 +122,8 @@ int daObj_Pleaf_c::isDelete() {
/* 80CB15E8-80CB1644 000988 005C+00 2/2 0/0 0/0 .text setEnvTevColor__13daObj_Pleaf_cFv
*/
void daObj_Pleaf_c::setEnvTevColor() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
}
/* 80CB1644-80CB1684 0009E4 0040+00 2/2 0/0 0/0 .text setRoomNo__13daObj_Pleaf_cFv */
src/d/actor/d_a_obj_ss_item.cpp
+2 -2
View File
@@ -295,8 +295,8 @@ void daObj_SSItem_c::setParam() {
/* 80CE7C24-80CE7C80 001084 005C+00 2/2 0/0 0/0 .text setEnvTevColor__14daObj_SSItem_cFv
*/
void daObj_SSItem_c::setEnvTevColor() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
}
/* 80CE7C80-80CE7CC4 0010E0 0044+00 2/2 0/0 0/0 .text setRoomNo__14daObj_SSItem_cFv */
src/d/actor/d_a_obj_tmoon.cpp
+1 -1
View File
@@ -77,7 +77,7 @@ int daObjTMoon_c::execute() {
/* 80D12EB4-80D12EDC 000394 0028+00 1/1 0/0 0/0 .text draw__12daObjTMoon_cFv */
int daObjTMoon_c::draw() {
g_env_light.mMoonPos = current.pos;
g_env_light.moon_pos = current.pos;
return 1;
}
src/d/actor/d_a_obj_tornado.cpp
+1 -1
View File
@@ -206,7 +206,7 @@ int daObjTrnd_c::draw() {
/* 80D1C298-80D1C2CC 000978 0034+00 1/1 0/0 0/0 .text _delete__11daObjTrnd_cFv */
int daObjTrnd_c::_delete() {
dKy_getEnvlight()->mEvtWindSet = 0;
dKy_getEnvlight()->evt_wind_go = 0;
cutPntWind();
return 1;
}
src/d/actor/d_a_obj_tornado2.cpp
+1 -1
View File
@@ -390,7 +390,7 @@ int daObjTrnd2_c::draw() {
/* 80D1D2E8-80D1D330 000E88 0048+00 1/1 0/0 0/0 .text _delete__12daObjTrnd2_cFv */
int daObjTrnd2_c::_delete() {
dKy_getEnvlight()->mEvtWindSet = 0;
dKy_getEnvlight()->evt_wind_go = 0;
cutPntWind();
endParticle();
return 1;
src/d/actor/d_a_obj_wchain.cpp
+5 -5
View File
@@ -44,7 +44,7 @@ cPhs__Step daObjWchain_c::create() {
if (!fopAcM_entrySolidHeap(this, daObjWchain_createHeap, 0x820)) {
return cPhs_ERROR_e;
}
tevStr.mRoomNo = dStage_roomControl_c::mStayNo;
tevStr.room_no = dStage_roomControl_c::mStayNo;
attention_info.position = current.pos;
eyePos = attention_info.position;
attention_info.distances[fopAc_attn_LOCK_e] = 0x1c;
@@ -317,10 +317,10 @@ void daObjWchain_shape_c::draw() {
material->loadSharedDL();
material->getShape()->loadPreDrawSetting();
GXColor amb_color;
amb_color.r = tevstr.mColorC0.r;
amb_color.g = tevstr.mColorC0.g;
amb_color.b = tevstr.mColorC0.b;
amb_color.a = tevstr.mColorC0.a;
amb_color.r = tevstr.AmbCol.r;
amb_color.g = tevstr.AmbCol.g;
amb_color.b = tevstr.AmbCol.b;
amb_color.a = tevstr.AmbCol.a;
GXSetChanAmbColor(GX_COLOR0A0, amb_color);
GXSetChanMatColor(GX_COLOR0A0, g_whiteColor);
dKy_setLight_again();
src/d/actor/d_a_obj_window.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ int daObjWindow_c::Create() {
mCyl.Set(l_cyl_src);
mCyl.SetStts(&mStts);
}
tevStr.mLightInf = getLightInf();
tevStr.mLightInf.r = getLightInf();
return 1;
}
src/d/actor/d_a_obj_yel_bag.cpp
+2 -2
View File
@@ -383,8 +383,8 @@ int daObj_YBag_c::isDelete() {
/* 80D3D468-80D3D4C4 001468 005C+00 2/2 0/0 0/0 .text setEnvTevColor__12daObj_YBag_cFv */
void daObj_YBag_c::setEnvTevColor() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
}
/* 80D3D4C4-80D3D508 0014C4 0044+00 2/2 0/0 0/0 .text setRoomNo__12daObj_YBag_cFv */
src/d/actor/d_a_obj_zra_rock.cpp
+2 -2
View File
@@ -31,8 +31,8 @@ void daObjZraRock_c::setBaseMtx() {
/* 80D44DCC-80D44E28 00018C 005C+00 1/1 0/0 0/0 .text setEnvTevColor__14daObjZraRock_cFv
*/
void daObjZraRock_c::setEnvTevColor() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
}
/* 80D44E28-80D44E68 0001E8 0040+00 1/1 0/0 0/0 .text setRoomNo__14daObjZraRock_cFv */
src/d/actor/d_a_spinner.cpp
+2 -2
View File
@@ -462,12 +462,12 @@ void daSpinner_c::setRoomInfo() {
int roomNo;
if (mAcch.GetGroundH() != -1000000000.0f) {
roomNo = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
} else {
roomNo = dComIfGp_roomControl_getStayNo();
}
tevStr.mRoomNo = roomNo;
tevStr.room_no = roomNo;
field_0xa6e = dComIfGp_getReverb(roomNo);
mStts.SetRoomId(roomNo);
fopAcM_SetRoomNo(this, roomNo);
src/d/actor/d_a_tag_hjump.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ int daTagHjump_c::create() {
if (phase == cPhs_COMPLEATE_e) {
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
tevStr.mRoomNo = fopAcM_GetRoomNo(this);
tevStr.room_no = fopAcM_GetRoomNo(this);
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
src/d/actor/d_a_tag_lantern.cpp
+3 -3
View File
@@ -48,13 +48,13 @@ int daTag_Lantern_c::Execute() {
s32 room_no;
if (mGroundCross != -1000000000.0f) {
room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
} else {
room_no = dComIfGp_roomControl_getStayNo();
}
tevStr.mRoomNo = room_no;
fopAcM_SetRoomNo(this, tevStr.mRoomNo);
tevStr.room_no = room_no;
fopAcM_SetRoomNo(this, tevStr.room_no);
attention_info.flags = 0;
attention_info.position = current.pos;
eyePos = attention_info.position;
src/d/actor/d_a_vrbox.cpp
+15 -15
View File
@@ -17,7 +17,7 @@ static int daVrbox_Draw(vrbox_class* i_this) {
daVrbox_color_set(i_this);
if (g_env_light.mVrboxInvisible) {
if (g_env_light.hide_vrbox) {
return 1;
}
@@ -64,16 +64,16 @@ static int daVrbox_Draw(vrbox_class* i_this) {
/* 804986B8-80498850 000218 0198+00 1/1 0/0 0/0 .text daVrbox_color_set__FP11vrbox_class
*/
static int daVrbox_color_set(vrbox_class* i_this) {
if ((g_env_light.mVrKasumiCol.r + g_env_light.mVrKasumiCol.g +
g_env_light.mVrKasumiCol.b + g_env_light.mVrSkyCol.r + g_env_light.mVrSkyCol.g +
g_env_light.mVrSkyCol.b + g_env_light.mVrkumoCol.r + g_env_light.mVrkumoCol.g +
g_env_light.mVrkumoCol.b) == 0)
if ((g_env_light.vrbox_kasumi_outer_col.r + g_env_light.vrbox_kasumi_outer_col.g +
g_env_light.vrbox_kasumi_outer_col.b + g_env_light.vrbox_sky_col.r + g_env_light.vrbox_sky_col.g +
g_env_light.vrbox_sky_col.b + g_env_light.vrbox_kumo_top_col.r + g_env_light.vrbox_kumo_top_col.g +
g_env_light.vrbox_kumo_top_col.b) == 0)
{
g_env_light.mVrboxInvisible = true;
g_env_light.hide_vrbox = true;
return 1;
}
g_env_light.mVrboxInvisible = false;
g_env_light.hide_vrbox = false;
J3DModelData* modelData = i_this->mpSoraModel->getModelData();
J3DGXColorS10 color;
@@ -83,9 +83,9 @@ static int daVrbox_color_set(vrbox_class* i_this) {
material_0->setCullMode(0);
material_0->change();
color.r = g_env_light.mVrSkyCol.r;
color.g = g_env_light.mVrSkyCol.g;
color.b = g_env_light.mVrSkyCol.b;
color.r = g_env_light.vrbox_sky_col.r;
color.g = g_env_light.vrbox_sky_col.g;
color.b = g_env_light.vrbox_sky_col.b;
color.a = 255;
material_0->setTevColor(0, &color);
}
@@ -95,10 +95,10 @@ static int daVrbox_color_set(vrbox_class* i_this) {
material_1->setCullMode(0);
material_1->change();
color.r = g_env_light.mVrOkuKasumiCol.r;
color.g = g_env_light.mVrOkuKasumiCol.g;
color.b = g_env_light.mVrOkuKasumiCol.b;
color.a = g_env_light.mVrOkuKasumiCol.a;
color.r = g_env_light.vrbox_kasumi_inner_col.r;
color.g = g_env_light.vrbox_kasumi_inner_col.g;
color.b = g_env_light.vrbox_kasumi_inner_col.b;
color.a = g_env_light.vrbox_kasumi_inner_col.a;
material_1->setTevColor(0, &color);
}
@@ -142,7 +142,7 @@ static int daVrbox_Create(fopAc_ac_c* i_this) {
if (fopAcM_entrySolidHeap(this_, daVrbox_solidHeapCB, 0xC60)) {
dComIfGp_onStatus(1);
g_env_light.mVrboxInvisible = false;
g_env_light.hide_vrbox = false;
} else {
phase = cPhs_ERROR_e;
}
src/d/actor/d_a_vrbox2.cpp
+34 -34
View File
@@ -240,10 +240,10 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
fogInfo_p->mType = 2;
}
if ((g_env_light.mVrKasumiCol.r + g_env_light.mVrKasumiCol.g +
g_env_light.mVrKasumiCol.b + g_env_light.mVrSkyCol.r + g_env_light.mVrSkyCol.g +
g_env_light.mVrSkyCol.b + g_env_light.mVrkumoCol.r + g_env_light.mVrkumoCol.g +
g_env_light.mVrkumoCol.b) == 0)
if ((g_env_light.vrbox_kasumi_outer_col.r + g_env_light.vrbox_kasumi_outer_col.g +
g_env_light.vrbox_kasumi_outer_col.b + g_env_light.vrbox_sky_col.r + g_env_light.vrbox_sky_col.g +
g_env_light.vrbox_sky_col.b + g_env_light.vrbox_kumo_top_col.r + g_env_light.vrbox_kumo_top_col.g +
g_env_light.vrbox_kumo_top_col.b) == 0)
{
return 1;
}
@@ -283,7 +283,7 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
sp14 = sun_p->mPos[0];
if (strcmp(dComIfGp_getStartStageName(), "F_SP102") == 0) {
dKyr_get_vectle_calc(&camera_p->lookat.eye, &g_env_light.mSunPos, &sp8);
dKyr_get_vectle_calc(&camera_p->lookat.eye, &g_env_light.sun_pos, &sp8);
sp14.x = camera_p->lookat.eye.x + (8000.0f * sp8.x);
sp14.y = camera_p->lookat.eye.y + (8000.0f * sp8.y);
sp14.z = camera_p->lookat.eye.z + (8000.0f * sp8.z);
@@ -296,7 +296,7 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
mDoMtx_stack_c::XrotM(0x7FFF - temp_r19);
f32 scale;
if (g_env_light.mDaytime < 255.0f) {
if (g_env_light.daytime < 255.0f) {
f32 temp_f4 = 1.0f - lenz_p->mDistFalloff;
scale = 1.0f;
@@ -305,8 +305,8 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
}
} else {
f32 var_f1;
if (g_env_light.mDaytime < 270.0f) {
var_f1 = dKy_get_parcent(270.0f, 240.0f, g_env_light.mDaytime);
if (g_env_light.daytime < 270.0f) {
var_f1 = dKy_get_parcent(270.0f, 240.0f, g_env_light.daytime);
} else {
var_f1 = 1.0f;
}
@@ -420,10 +420,10 @@ SECTION_DEAD static char const* const stringBase_80499AD4 = "R_SP30";
static int daVrbox2_color_set(vrbox2_class* i_this) {
dKankyo_sun_Packet* sun_p = g_env_light.mpSunPacket;
if ((g_env_light.mVrKasumiCol.r + g_env_light.mVrKasumiCol.g +
g_env_light.mVrKasumiCol.b + g_env_light.mVrSkyCol.r + g_env_light.mVrSkyCol.g +
g_env_light.mVrSkyCol.b + g_env_light.mVrkumoCol.r + g_env_light.mVrkumoCol.g +
g_env_light.mVrkumoCol.b) == 0)
if ((g_env_light.vrbox_kasumi_outer_col.r + g_env_light.vrbox_kasumi_outer_col.g +
g_env_light.vrbox_kasumi_outer_col.b + g_env_light.vrbox_sky_col.r + g_env_light.vrbox_sky_col.g +
g_env_light.vrbox_sky_col.b + g_env_light.vrbox_kumo_top_col.r + g_env_light.vrbox_kumo_top_col.g +
g_env_light.vrbox_kumo_top_col.b) == 0)
{
return 1;
}
@@ -500,16 +500,16 @@ static int daVrbox2_color_set(vrbox2_class* i_this) {
kumo_material0->setCullMode(0);
kumo_material0->change();
k_color.r = g_env_light.mVrShitaGumoCol.r;
k_color.g = g_env_light.mVrShitaGumoCol.g;
k_color.b = g_env_light.mVrShitaGumoCol.b;
k_color.a = g_env_light.mVrkumoCol.a;
k_color.r = g_env_light.vrbox_kumo_bottom_col.r;
k_color.g = g_env_light.vrbox_kumo_bottom_col.g;
k_color.b = g_env_light.vrbox_kumo_bottom_col.b;
k_color.a = g_env_light.vrbox_kumo_top_col.a;
kumo_material0->setTevKColor(0, &k_color);
color.r = g_env_light.mVrShitaUneiCol.r;
color.g = g_env_light.mVrShitaUneiCol.g;
color.b = g_env_light.mVrShitaUneiCol.b;
color.a = (u8)g_env_light.mVrkumoCol.a;
color.r = g_env_light.vrbox_kumo_shadow_col.r;
color.g = g_env_light.vrbox_kumo_shadow_col.g;
color.b = g_env_light.vrbox_kumo_shadow_col.b;
color.a = (u8)g_env_light.vrbox_kumo_top_col.a;
kumo_material0->setTevColor(0, &color);
}
@@ -518,16 +518,16 @@ static int daVrbox2_color_set(vrbox2_class* i_this) {
kumo_material1->setCullMode(0);
kumo_material1->change();
k_color.r = g_env_light.mVrShitaGumoCol.r;
k_color.g = g_env_light.mVrShitaGumoCol.g;
k_color.b = g_env_light.mVrShitaGumoCol.b;
k_color.a = g_env_light.mVrkumoCol.a;
k_color.r = g_env_light.vrbox_kumo_bottom_col.r;
k_color.g = g_env_light.vrbox_kumo_bottom_col.g;
k_color.b = g_env_light.vrbox_kumo_bottom_col.b;
k_color.a = g_env_light.vrbox_kumo_top_col.a;
kumo_material1->setTevKColor(0, &k_color);
color.r = g_env_light.mVrShitaUneiCol.r;
color.g = g_env_light.mVrShitaUneiCol.g;
color.b = g_env_light.mVrShitaUneiCol.b;
color.a = g_env_light.mVrkumoCol.a;
color.r = g_env_light.vrbox_kumo_shadow_col.r;
color.g = g_env_light.vrbox_kumo_shadow_col.g;
color.b = g_env_light.vrbox_kumo_shadow_col.b;
color.a = g_env_light.vrbox_kumo_top_col.a;
kumo_material1->setTevColor(0, &color);
}
@@ -537,10 +537,10 @@ static int daVrbox2_color_set(vrbox2_class* i_this) {
kasumim_material0->setCullMode(0);
kasumim_material0->change();
color.r = g_env_light.mVrKasumiCol.r;
color.g = g_env_light.mVrKasumiCol.g;
color.b = g_env_light.mVrKasumiCol.b;
color.a = g_env_light.mVrKasumiCol.a;
color.r = g_env_light.vrbox_kasumi_outer_col.r;
color.g = g_env_light.vrbox_kasumi_outer_col.g;
color.b = g_env_light.vrbox_kasumi_outer_col.b;
color.a = g_env_light.vrbox_kasumi_outer_col.a;
kasumim_material0->setTevColor(0, &color);
}
@@ -563,7 +563,7 @@ static int daVrbox2_color_set(vrbox2_class* i_this) {
k_color.a = sun_p->field_0x74.a;
if (i == 1) {
if (g_env_light.mDaytime > 255.0f || g_env_light.mDaytime < 97.5f) {
if (g_env_light.daytime > 255.0f || g_env_light.daytime < 97.5f) {
cLib_addCalc(&sun_p->field_0x64, 1.0f, 0.2f, 0.1f, 0.0001f);
} else {
cLib_addCalc(&sun_p->field_0x64, 0.0f, 0.2f, 0.1f, 0.0001f);
@@ -599,7 +599,7 @@ static int daVrbox2_color_set(vrbox2_class* param_0) {
/* 804997E8-8049982C 000DE8 0044+00 1/0 0/0 0/0 .text daVrbox2_Execute__FP12vrbox2_class
*/
static int daVrbox2_Execute(vrbox2_class* i_this) {
if (g_env_light.mDaytime > FLOAT_LABEL(lit_3837)) {
if (g_env_light.daytime > FLOAT_LABEL(lit_3837)) {
i_this->mSunBtk.play();
}
src/d/actor/d_grass.inc
+2 -2
View File
@@ -270,7 +270,7 @@ void dGrass_packet_c::update() {
mtx[1][3] = data_p->m_pos.y;
mtx[2][3] = data_p->m_pos.z;
if (g_env_light.mInitAnmTimer == 1) {
if (g_env_light.light_init_timer == 1) {
mAngleZ[i] = 0;
}
@@ -456,4 +456,4 @@ dGrass_data_c::~dGrass_data_c() {}
/* 8052097C-80520988 004D1C 000C+00 1/1 0/0 0/0 .text __ct__13dGrass_data_cFv */
dGrass_data_c::dGrass_data_c() {
m_state = 0;
}
}
src/d/d_com_inf_game.cpp
+4 -4
View File
@@ -764,7 +764,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room
// Stage is Fishing Pond or Hena's Hut
else if (!strcmp(i_stageName, "F_SP127") || !strcmp(i_stageName, "R_SP127"))
{
switch (g_env_light.mPondSeason) {
switch (g_env_light.fishing_hole_season) {
case 1:
o_layer = 0;
break;
@@ -2296,7 +2296,7 @@ BOOL dComIfGs_wolfeye_effect_check() {
dScnKy_env_light_c* env_light = dKy_getEnvlight();
BOOL ret = false;
if (env_light->field_0xf3d == 1 && env_light->field_0xf40 > 0.6) {
if (env_light->now_senses_effect == 1 && env_light->senses_effect_strength > 0.6) {
ret = true;
}
return ret;
@@ -2383,12 +2383,12 @@ BOOL dComIfGs_isVisitedRoom(int param_0) {
/* 8002FCF4-8002FD08 02A634 0014+00 0/0 1/1 0/0 .text dComIfGs_staffroll_next_go__Fv */
void dComIfGs_staffroll_next_go() {
g_env_light.field_0x130c = true;
g_env_light.staffroll_next_timer = true;
}
/* 8002FD08-8002FD18 02A648 0010+00 0/0 1/1 0/0 .text dComIfGs_staffroll_next_go_check__Fv */
u8 dComIfGs_staffroll_next_go_check() {
return g_env_light.field_0x130c;
return g_env_light.staffroll_next_timer;
}
/* 80450608-8045060C 000088 0004+00 0/0 6/6 11/11 .sdata g_whiteColor */
src/d/d_demo.cpp
+2 -2
View File
@@ -1118,13 +1118,13 @@ int dDemo_c::update() {
dScnKy_env_light_c* env_light = &g_env_light;
if (dComIfGs_staffroll_next_go_check() > 10) {
env_light->field_0x130c = 0;
env_light->staffroll_next_timer = 0;
m_mode = 2;
} else {
if (dComIfGs_staffroll_next_go_check() == 1) {
mDoGph_gInf_c::fadeOut(0.1f, g_blackColor);
}
env_light->field_0x130c++;
env_light->staffroll_next_timer++;
}
}
src/d/d_drawlist.cpp
+5 -5
View File
@@ -1212,7 +1212,7 @@ static void setkankyoShadow(dKy_tevstr_c* param_0, f32* param_1) {
*param_1 *= env_light->field_0x1238;
}
if ((env_light->mShadowMode & 4) && param_0 != NULL) {
if ((env_light->shadow_mode & 4) && param_0 != NULL) {
*param_1 *= param_0->field_0x344;
}
@@ -1220,8 +1220,8 @@ static void setkankyoShadow(dKy_tevstr_c* param_0, f32* param_1) {
*param_1 += env_light->mThunderEff.mFlashTimer;
}
if (g_env_light.mSwordLight.mState == 2) {
f32 fvar1 = g_env_light.mSwordLight.mFrame / 15.0f;
if (g_env_light.eflight.mState == 2) {
f32 fvar1 = g_env_light.eflight.mFrame / 15.0f;
if (fvar1 > 1.0f) {
fvar1 = 1.0f;
}
@@ -1307,8 +1307,8 @@ u32 dDlst_shadowReal_c::set(u32 i_key, J3DModel* i_model, cXyz* param_2, f32 par
} else {
sp60 = dKy_plight_near_pos();
if (!(env_light->mShadowMode & 4) &&
((env_light->mShadowMode & 1) || (env_light->mShadowMode & 2)))
if (!(env_light->shadow_mode & 4) &&
((env_light->shadow_mode & 1) || (env_light->shadow_mode & 2)))
{
sp60 = g_env_light.field_0x10a0;
param_5->mLightPosWorld = g_env_light.field_0x10a0;
src/d/d_kankyo.cpp
+4256 -2352
View File
File diff suppressed because it is too large Load Diff
src/d/d_kankyo_data.cpp
+51 -51
View File
@@ -25,7 +25,7 @@ struct dKyd_l_vr_box_data_struct {
//
/* 803A8E98-803A9198 005FB8 0300+00 1/1 0/0 0/0 .data l_kydata_BloomInf_tbl */
static dkydata_bloomInfo_info_class l_kydata_BloomInf_tbl[BLOOMINFO_MAX] = {
static dKydata_BloomInfo_c l_kydata_BloomInf_tbl[BLOOMINFO_MAX] = {
{BLOOM_SOFT, 0xFF, 0x40, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00},
{BLOOM_CLEAR, 0x28, 0x46, 0x87, 0xCF, 0xB1, 0x38, 0xD2, 0xFF, 0xFF, 0xFF, 0x60}, // Twilight
{BLOOM_CLEAR, 0x2D, 0x46, 0x73, 0xCF, 0xB1, 0x38, 0xD2, 0xFF, 0xFF, 0xFF,
@@ -120,40 +120,40 @@ static dkydata_bloomInfo_info_class l_kydata_BloomInf_tbl[BLOOMINFO_MAX] = {
/* 803A9198-803A92A8 -00001 0110+00 1/1 0/0 0/0 .data l_darkworld_tbl */
static dKydata_darkworldInfo_c l_darkworld_tbl[34] = {
{"R_SP30", UNCLEARABLE}, // UNUSED - Unknown Room
{"T_SP05", TEST}, // UNUSED - E3 2005 Warp Test (Old)
{"T_SP05A", TEST}, // UNUSED - Ito Warp Test
{"T_WARP2", TEST}, // UNUSED - Unknown Test
{"T_IMAI", TEST}, // UNUSED - Imai Shape Check (Level 2)
{"T_IMAI0", TEST}, // UNUSED - Imai Shape Check (Level 3)
{"T_TOMI", TEST}, // UNUSED - Tominaga Test 1
{"T_TOMI", TEST}, // UNUSED - Same as above
{"T_TOMI", TEST}, // UNUSED - Same as above
{"T_SASA1", TEST}, // UNUSED - Sasaki Test 1
{"F_SP105", FARON}, // UNUSED - L1 Forest Field
{"F_SP05", TEST}, // UNUSED - Statue Forest
{"R_SP107", LANAYRU}, // Castle Sewers/Rooftops/Tower
{"F_SP108", FARON}, // Faron Woods
{"R_SP108", FARON}, // Coro's Lantern Shop
{"TEST11", TEST}, // UNUSED - Local Map C
{"F_SP109", ELDIN}, // Kakariko Village
{"F_SP110", ELDIN}, // Death Mountain
{"R_SP109", ELDIN}, // Kakariko Interiors
{"F_SP111", ELDIN}, // Kakariko Graveyard
{"F_SP112", LANAYRU}, // Zora's River
{"F_SP113", LANAYRU}, // Zora's Domain
{"F_SP115", LANAYRU}, // Lake Hylia
{"F_SP116", LANAYRU}, // Hyrule Castle Town
{"F_SP122", LANAYRU}, // Castle Town Gates
{"F_SP121", ELDIN}, // Hyrule Field
{"F_SP126", LANAYRU}, // Upper Zora's River
{"R_SP209", ELDIN}, // Sanctuary Basement
{"R_SP116", LANAYRU}, // Hyrule Castle Town Interiors
{"D_MN08", UNCLEARABLE}, // Palace of Twilight
{"D_MN08B", UNCLEARABLE}, // Palace of Twilight Miniboss A
{"D_MN08C", UNCLEARABLE}, // Palace of Twilight Miniboss B
{"D_MN08A", UNCLEARABLE}, // Palace of Twilight Throne Room
{"D_SB10", FARON}, // Faron Woods Cave
{"R_SP30", KY_DARKLV_UNCLEARABLE}, // UNUSED - Unknown Room
{"T_SP05", KY_DARKLV_TEST}, // UNUSED - E3 2005 Warp Test (Old)
{"T_SP05A", KY_DARKLV_TEST}, // UNUSED - Ito Warp Test
{"T_WARP2", KY_DARKLV_TEST}, // UNUSED - Unknown Test
{"T_IMAI", KY_DARKLV_TEST}, // UNUSED - Imai Shape Check (Level 2)
{"T_IMAI0", KY_DARKLV_TEST}, // UNUSED - Imai Shape Check (Level 3)
{"T_TOMI", KY_DARKLV_TEST}, // UNUSED - Tominaga Test 1
{"T_TOMI", KY_DARKLV_TEST}, // UNUSED - Same as above
{"T_TOMI", KY_DARKLV_TEST}, // UNUSED - Same as above
{"T_SASA1", KY_DARKLV_TEST}, // UNUSED - Sasaki Test 1
{"F_SP105", KY_DARKLV_FARON}, // UNUSED - L1 Forest Field
{"F_SP05", KY_DARKLV_TEST}, // UNUSED - Statue Forest
{"R_SP107", KY_DARKLV_LANAYRU}, // Castle Sewers/Rooftops/Tower
{"F_SP108", KY_DARKLV_FARON}, // Faron Woods
{"R_SP108", KY_DARKLV_FARON}, // Coro's Lantern Shop
{"TEST11", KY_DARKLV_TEST}, // UNUSED - Local Map C
{"F_SP109", KY_DARKLV_ELDIN}, // Kakariko Village
{"F_SP110", KY_DARKLV_ELDIN}, // Death Mountain
{"R_SP109", KY_DARKLV_ELDIN}, // Kakariko Interiors
{"F_SP111", KY_DARKLV_ELDIN}, // Kakariko Graveyard
{"F_SP112", KY_DARKLV_LANAYRU}, // Zora's River
{"F_SP113", KY_DARKLV_LANAYRU}, // Zora's Domain
{"F_SP115", KY_DARKLV_LANAYRU}, // Lake Hylia
{"F_SP116", KY_DARKLV_LANAYRU}, // Hyrule Castle Town
{"F_SP122", KY_DARKLV_LANAYRU}, // Castle Town Gates
{"F_SP121", KY_DARKLV_ELDIN}, // Hyrule Field
{"F_SP126", KY_DARKLV_LANAYRU}, // Upper Zora's River
{"R_SP209", KY_DARKLV_ELDIN}, // Sanctuary Basement
{"R_SP116", KY_DARKLV_LANAYRU}, // Hyrule Castle Town Interiors
{"D_MN08", KY_DARKLV_UNCLEARABLE}, // Palace of Twilight
{"D_MN08B", KY_DARKLV_UNCLEARABLE}, // Palace of Twilight Miniboss A
{"D_MN08C", KY_DARKLV_UNCLEARABLE}, // Palace of Twilight Miniboss B
{"D_MN08A", KY_DARKLV_UNCLEARABLE}, // Palace of Twilight Throne Room
{"D_SB10", KY_DARKLV_FARON}, // Faron Woods Cave
};
/* 803A92A8-803A93C8 -00001 0120+00 1/1 0/0 0/0 .data l_light_size_tbl */
@@ -211,22 +211,22 @@ static dKydata_lightsizeInfo_c l_light_size_tbl_tw[9] = {
// Maple color. Used in Fishing Hole. Values are RGB. TODO: struct here?
/* 803A9410-803A9434 006530 0024+00 1/1 0/0 0/0 .data l_maple_col */
static u8 l_maple_col[36] = {
static color_RGB_class l_maple_col[] = {
// leaf color blend major
0x56, 0x4B, 0x39, // spring
0x37, 0x28, 0x1E, // summer
0x6E, 0x32, 0x0F, // fall
0x64, 0x64, 0x80, // winter
{0x56, 0x4B, 0x39}, // spring
{0x37, 0x28, 0x1E}, // summer
{0x6E, 0x32, 0x0F}, // fall
{0x64, 0x64, 0x80}, // winter
// leaf color blend minor
0x52, 0x41, 0x66, // spring
0x19, 0x0F, 0x00, // summer
0x46, 0x00, 0x0F, // fall
0x64, 0x64, 0x80, // winter
{0x52, 0x41, 0x66}, // spring
{0x19, 0x0F, 0x00}, // summer
{0x46, 0x00, 0x0F}, // fall
{0x64, 0x64, 0x80}, // winter
// leaf color base
0x65, 0x5E, 0x69, // spring
0x0E, 0x23, 0x0B, // summer
0x28, 0x14, 0x05, // fall
0x5A, 0x5A, 0x6E, // winter
{0x65, 0x5E, 0x69}, // spring
{0x0E, 0x23, 0x0B}, // summer
{0x28, 0x14, 0x05}, // fall
{0x5A, 0x5A, 0x6E}, // winter
};
/* 803A9434-803A94B8 006554 0084+00 1/1 0/0 0/0 .data l_time_attribute */
@@ -817,7 +817,7 @@ void dKyd_xfog_table_set(u8 tblIdx) {
}
/* 80056A64-80056A70 0513A4 000C+00 0/0 1/1 0/0 .text dKyd_maple_col_getp__Fv */
void* dKyd_maple_col_getp() {
color_RGB_class* dKyd_maple_col_getp() {
return l_maple_col;
}
@@ -837,8 +837,8 @@ dKydata_lightsizeInfo_c* dKyd_light_tw_size_tbl_getp() {
}
/* 80056A94-80056AA8 0513D4 0014+00 0/0 1/1 0/0 .text dKyd_BloomInf_tbl_getp__Fi */
dkydata_bloomInfo_info_class* dKyd_BloomInf_tbl_getp(int tblIdx) {
dKydata_BloomInfo_c* dKyd_BloomInf_tbl_getp(int tblIdx) {
return &l_kydata_BloomInf_tbl[tblIdx];
}
/* 8037A1C0-8037A1C0 006820 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 8037A1C0-8037A1C0 006820 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_kankyo_rain.cpp
+71 -71
View File
@@ -150,7 +150,7 @@ void dKyr_lenzflare_move() {
/* 8005BED8-8005BF08 056818 0030+00 1/1 0/0 0/0 .text dKyr_moon_arrival_check__Fv */
static BOOL dKyr_moon_arrival_check() {
BOOL rv = FALSE;
if (g_env_light.mDaytime > 285.0f || g_env_light.mDaytime < 67.5f) {
if (g_env_light.daytime > 285.0f || g_env_light.daytime < 67.5f) {
rv = TRUE;
}
return rv;
@@ -175,11 +175,11 @@ void dKyr_sun_move() {
u32 stage_type = dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo());
if (g_env_light.mBaseLightInfluence.mColor.r == 0 && stage_type != ST_ROOM) {
dKyr_get_vectle_calc(&camera_p2->lookat.eye, &g_env_light.mBaseLightInfluence.mPosition,
if (g_env_light.base_light.mColor.r == 0 && stage_type != ST_ROOM) {
dKyr_get_vectle_calc(&camera_p2->lookat.eye, &g_env_light.base_light.mPosition,
&lightDir);
} else {
dKyr_get_vectle_calc(&camera_p2->lookat.eye, &g_env_light.mSunPos2, &lightDir);
dKyr_get_vectle_calc(&camera_p2->lookat.eye, &g_env_light.sun_light_pos, &lightDir);
}
sun_packet->mPos[0].x = camera_p2->lookat.eye.x + 8000.0f * lightDir.x;
@@ -209,7 +209,7 @@ void dKyr_sun_move() {
sun_packet->field_0x29 = 0;
if (g_env_light.mDaytime > 77.5f && g_env_light.mDaytime < 285.0f && dKy_rain_check() < 20 &&
if (g_env_light.daytime > 77.5f && g_env_light.daytime < 285.0f && dKy_rain_check() < 20 &&
strcmp(dComIfGp_getStartStageName(), "F_SP200") != 0 &&
strcmp(dComIfGp_getStartStageName(), "D_MN09B") != 0)
{
@@ -334,7 +334,7 @@ void dKyr_sun_move() {
}
}
if (g_env_light.mDaytime < 255.0f && g_env_light.mColpatWeather == 0) {
if (g_env_light.daytime < 255.0f && g_env_light.mColpatWeather == 0) {
cLib_addCalc(&sun_packet->field_0x6c, 1.0f, 0.1f, 0.01f, 0.0001f);
} else {
cLib_addCalc(&sun_packet->field_0x6c, 0.0f, 0.5f, 0.1f, 0.001f);
@@ -351,12 +351,12 @@ void dKyr_sun_move() {
{255, 78, 0, 255},
};
if (g_env_light.mDaytime < 180.0f) {
if (g_env_light.daytime < 180.0f) {
f32 parcent;
if (g_env_light.mDaytime < 90.0f) {
if (g_env_light.daytime < 90.0f) {
parcent = 0.0f;
} else if (g_env_light.mDaytime < 105.0f) {
parcent = dKy_get_parcent(105.0f, 90.0f, g_env_light.mDaytime);
} else if (g_env_light.daytime < 105.0f) {
parcent = dKy_get_parcent(105.0f, 90.0f, g_env_light.daytime);
} else {
parcent = 1.0f;
}
@@ -376,10 +376,10 @@ void dKyr_sun_move() {
(f32)sun_color2[0].b + parcent * ((f32)sun_color2[1].b - (f32)sun_color2[0].b);
} else {
f32 parcent;
if (g_env_light.mDaytime < 247.5f) {
if (g_env_light.daytime < 247.5f) {
parcent = 1.0f;
} else if (g_env_light.mDaytime < 270.0f) {
parcent = 1.0f - dKy_get_parcent(270.0f, 247.5f, g_env_light.mDaytime);
} else if (g_env_light.daytime < 270.0f) {
parcent = 1.0f - dKy_get_parcent(270.0f, 247.5f, g_env_light.daytime);
} else {
parcent = 0.0f;
}
@@ -413,11 +413,11 @@ void dKyr_sun_move() {
cLib_addCalc(&sun_packet->mMoonAlpha, 0.0f, 0.2f, 0.01f, 0.001f);
}
if (g_env_light.mCameraInWater == 0 && g_env_light.mDaytime > 255.0f &&
if (g_env_light.camera_water_in_status == 0 && g_env_light.daytime > 255.0f &&
sun_packet->mSunAlpha >= 0.2f)
{
cXyz sp24;
dKyr_get_vectle_calc(&camera_p2->lookat.eye, &g_env_light.mSunPos2, &lightDir);
dKyr_get_vectle_calc(&camera_p2->lookat.eye, &g_env_light.sun_light_pos, &lightDir);
sp24.x = camera_p2->lookat.eye.x + 30160.0f * lightDir.x;
sp24.y = camera_p2->lookat.eye.y + 30160.0f * lightDir.y;
sp24.z = camera_p2->lookat.eye.z + 30160.0f * lightDir.z;
@@ -447,7 +447,7 @@ void dKyr_rain_init() {
for (int i = 0; i < 250; i++) {
g_env_light.mpRainPacket->mRainEff[i].mStatus = 0;
}
g_env_light.mpRainPacket->mRainCount = 0;
g_env_light.mpRainPacket->raincnt = 0;
}
/* 8005CDA8-8005CDD0 0576E8 0028+00 1/1 0/0 0/0 .text rain_bg_chk__FP19dKankyo_rain_Packeti */
@@ -557,11 +557,11 @@ void dKyr_rain_move() {
spA4.y = -2.5f;
spA4.z = 0.0f;
if (rain_packet->mRainCount <= g_env_light.mRainCount) {
rain_packet->mRainCount = g_env_light.mRainCount;
if (rain_packet->raincnt <= g_env_light.raincnt) {
rain_packet->raincnt = g_env_light.raincnt;
}
if (rain_packet->mRainCount != 0) {
if (rain_packet->raincnt != 0) {
dKyr_get_vectle_calc(&camera->lookat.center, &rain_packet->mCamCenterPos, &spB0);
f32 var_f1 = rain_packet->mCamEyePos.abs(camera->lookat.eye);
@@ -674,7 +674,7 @@ void dKyr_rain_move() {
}
f32 temp_f30 = 1.0f;
for (int i = rain_packet->mRainCount - 1; i >= 0; i--) {
for (int i = rain_packet->raincnt - 1; i >= 0; i--) {
rain_packet->mRainEff[i].mBasePos.y = spE0.y;
RAIN_EFF* effect = &rain_packet->mRainEff[i];
@@ -767,9 +767,9 @@ void dKyr_rain_move() {
spBC.y = effect->mBasePos.y + effect->mPosition.y;
spBC.z = effect->mBasePos.z + effect->mPosition.z;
if (i > g_env_light.mRainCount - 1) {
if (i == rain_packet->mRainCount - 1) {
rain_packet->mRainCount--;
if (i > g_env_light.raincnt - 1) {
if (i == rain_packet->raincnt - 1) {
rain_packet->raincnt--;
}
}
@@ -969,7 +969,7 @@ void dKyr_housi_move() {
if (g_env_light.field_0xea9 == 1) {
var_f31 = 0.0f;
if (g_env_light.mCameraInWater) {
if (g_env_light.camera_water_in_status) {
dBgS_CamGndChk_Wtr sp90;
cXyz sp48;
@@ -1052,7 +1052,7 @@ void dKyr_housi_move() {
effect->mPosition.y -= var_f23 * 0.6f;
if (g_env_light.field_0xea9 == 2) {
if (g_env_light.mPondSeason == 3) {
if (g_env_light.fishing_hole_season == 3) {
effect->mPosition.y -= var_f23 * 3.0f;
} else {
effect->mPosition.y -= var_f23 * 1.5f;
@@ -1183,7 +1183,7 @@ void dKyr_housi_move() {
effect->mPosition.y = 3200.0f - effect->mBasePos.y;
}
if (g_env_light.mPondSeason == 1) {
if (g_env_light.fishing_hole_season == 1) {
if (sp6C.x > 600.0f || sp6C.z > 1600.0f) {
effect->mStatus = 1;
} else {
@@ -1791,7 +1791,7 @@ void cloud_shadow_move() {
} else if (g_env_light.mMoyaMode == 4) {
alpha_max = 0.38f * dKyw_get_wind_pow();
} else if (g_env_light.mMoyaMode == 50) {
alpha_max = 0.25f * (envlight->field_0xf40 * envlight->field_0xf40 * envlight->field_0xf40);
alpha_max = 0.25f * (envlight->senses_effect_strength * envlight->senses_effect_strength * envlight->senses_effect_strength);
packet->mCloudEff[i].mAlpha = alpha_max * alpha_target;
} else if (g_env_light.mMoyaMode == 5) {
alpha_max = 0.09f;
@@ -2058,8 +2058,8 @@ static void dKyr_draw_rev_moon(Mtx drawMtx, u8** tex) {
cXyz pos[4];
u16 date = dComIfGs_getDate();
cXyz sp60 = camera->lookat.eye + g_env_light.mMoonPos;
sp60.y = camera->lookat.eye.y - g_env_light.mMoonPos.y;
cXyz sp60 = camera->lookat.eye + g_env_light.moon_pos;
sp60.y = camera->lookat.eye.y - g_env_light.moon_pos.y;
cXyz moon_pos;
moon_pos.x = sp60.x - camera->lookat.eye.x;
@@ -2117,9 +2117,9 @@ static void dKyr_draw_rev_moon(Mtx drawMtx, u8** tex) {
}
GXColor color_reg0;
color_reg0.r = g_env_light.mFogColor.r;
color_reg0.g = g_env_light.mFogColor.g;
color_reg0.b = g_env_light.mFogColor.b;
color_reg0.r = g_env_light.fog_col.r;
color_reg0.g = g_env_light.fog_col.g;
color_reg0.b = g_env_light.fog_col.b;
color_reg0.a = 0xFF;
GXColor color_reg1;
@@ -2368,8 +2368,8 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* ppos, GXColor& unused, u8** tex) {
sunpos.z = ppos->z;
u32 stage_type = dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo());
if (g_env_light.mBaseLightInfluence.mColor.r == 0 && stage_type != ST_ROOM) {
if (g_env_light.mDaytime > 285.0f || g_env_light.mDaytime < 105.0f) {
if (g_env_light.base_light.mColor.r == 0 && stage_type != ST_ROOM) {
if (g_env_light.daytime > 285.0f || g_env_light.daytime < 105.0f) {
draw_moon = false;
}
@@ -2378,10 +2378,10 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* ppos, GXColor& unused, u8** tex) {
spB4.z = ppos->z;
} else {
if (strcmp(dComIfGp_getStartStageName(), "F_SP200") == 0 && dComIfG_play_c::getLayerNo(0) == 0) {
spB4 = envlight->mMoonPos;
spB4 = envlight->moon_pos;
moon_pos = spB4;
} else {
spB4 = camera->lookat.eye + envlight->mMoonPos;
spB4 = camera->lookat.eye + envlight->moon_pos;
moon_pos.x = spB4.x - camera->lookat.eye.x;
moon_pos.y = spB4.y - camera->lookat.eye.y;
moon_pos.z = spB4.z - camera->lookat.eye.z;
@@ -2460,9 +2460,9 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* ppos, GXColor& unused, u8** tex) {
}
GXColor color_reg0;
color_reg0.r = g_env_light.mFogColor.r;
color_reg0.g = g_env_light.mFogColor.g;
color_reg0.b = g_env_light.mFogColor.b;
color_reg0.r = g_env_light.fog_col.r;
color_reg0.g = g_env_light.fog_col.g;
color_reg0.b = g_env_light.fog_col.b;
color_reg0.a = 0xFF;
GXColor color_reg1;
@@ -3124,12 +3124,12 @@ void dKyr_drawRain(Mtx drawMtx, u8** tex) {
cXyz sp3C;
cXyz sp30;
if (g_env_light.mSnowCount == 0 && !g_env_light.mCameraInWater) {
if (g_env_light.mSnowCount == 0 && !g_env_light.camera_water_in_status) {
sp30.x = 0.0f;
sp30.y = -2.0f;
sp30.z = 0.0f;
if (rain_packet->mRainCount != 0) {
if (rain_packet->raincnt != 0) {
GXColor color_reg0;
color_reg0.r = 0xFF;
color_reg0.g = 0xFF;
@@ -3166,7 +3166,7 @@ void dKyr_drawRain(Mtx drawMtx, u8** tex) {
GXLoadPosMtxImm(drawMtx, GX_PNMTX0);
GXSetCurrentMtx(GX_PNMTX0);
for (int i = 0; i < rain_packet->mRainCount; i++) {
for (int i = 0; i < rain_packet->raincnt; i++) {
f32 temp_f30 = -1.0f;
if (!(rain_packet->mRainEff[i].mAlpha <= 0.0f)) {
@@ -3263,7 +3263,7 @@ void dKyr_drawSibuki(Mtx drawMtx, u8** tex) {
cXyz eyevect;
cXyz sp38;
if (g_env_light.mSnowCount == 0 && g_env_light.mCameraInWater == 0 && dComIfGd_getView() != NULL) {
if (g_env_light.mSnowCount == 0 && g_env_light.camera_water_in_status == 0 && dComIfGd_getView() != NULL) {
Mtx camMtx;
MTXInverse(dComIfGd_getView()->viewMtxNoTrans, camMtx);
} else {
@@ -3340,7 +3340,7 @@ void dKyr_drawSibuki(Mtx drawMtx, u8** tex) {
scale = 0.2f;
}
for (int i = 0; i < g_env_light.mRainCount >> 1; i++) {
for (int i = 0; i < g_env_light.raincnt >> 1; i++) {
cXyz pos[4];
f32 size = scale * (15.0f + cM_rndF(10.0f));
cXyz sp20;
@@ -3415,7 +3415,7 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) {
if (g_env_light.field_0xea9 == 1) {
var_f25 = 140.0f;
} else if (g_env_light.mCameraInWater != 0) {
} else if (g_env_light.camera_water_in_status != 0) {
return;
}
@@ -3452,13 +3452,13 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) {
color_reg1.g = 0x50;
color_reg1.b = 0x50;
} else if (g_env_light.field_0xea9 == 2 &&
(g_env_light.mPondSeason == 1 || g_env_light.mPondSeason == 3))
(g_env_light.fishing_hole_season == 1 || g_env_light.fishing_hole_season == 3))
{
GXColor sp1C = {0x32, 0x32, 0x32, 0xFF};
GXColor sp18 = {0xFF, 0xD7, 0xF0, 0xFF};
camera_class* cam_p = dComIfGp_getCamera(0);
if (g_env_light.mPondSeason == 3) {
if (g_env_light.fishing_hole_season == 3) {
sp1C.r = 0x78;
sp1C.g = 0x0A;
sp1C.b = 0x14;
@@ -3630,7 +3630,7 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) {
}
f32 var_f2;
if (g_env_light.mPondSeason == 3) {
if (g_env_light.fishing_hole_season == 3) {
var_f2 = 15.0f;
if (housi_packet->mHousiEff[j].mStatus == 1) {
@@ -3665,7 +3665,7 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) {
mDoMtx_stack_c::ZrotM(housi_packet->mHousiEff[j].field_0x38);
} else {
if (housi_packet->mHousiEff[j].mStatus == 2) {
if (g_env_light.mPondSeason == 3) {
if (g_env_light.fishing_hole_season == 3) {
housi_packet->mHousiEff[j].field_0x38 += var_f24 * 30.0f;
} else {
housi_packet->mHousiEff[j].field_0x38 +=
@@ -3793,7 +3793,7 @@ void dKyr_drawSnow(Mtx drawMtx, u8** tex) {
sp54 = snow_packet->field_0x6d88;
}
if (!g_env_light.mCameraInWater) {
if (!g_env_light.camera_water_in_status) {
dKy_ParticleColor_get_bg(&camera->lookat.eye, NULL, &sp64, &sp60, &sp5C, &sp58, 0.0f);
color_reg0.r = 178.5f + (0.3f * sp60.r);
color_reg0.g = 178.5f + (0.3f * sp60.g);
@@ -4113,9 +4113,9 @@ void dKyr_drawStar(Mtx drawMtx, u8** tex) {
}
if (strcmp(dComIfGp_getStartStageName(), "F_SP200") == 0 && dComIfG_play_c::getLayerNo(0) == 0) {
moon_pos = envlight->mMoonPos;
moon_pos = envlight->moon_pos;
} else {
moon_pos = camera->lookat.eye + envlight->mMoonPos;
moon_pos = camera->lookat.eye + envlight->moon_pos;
if (sp38) {
moon_pos.x = 3900.0f + camera->lookat.eye.x;
moon_pos.y = 8052.0f + camera->lookat.eye.y;
@@ -4615,7 +4615,7 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) {
unused = 1.0f - (0.09f * (camera->lookat.eye.y - sp70));
}
if (g_env_light.mDaytime > 105.0f && g_env_light.mDaytime < 240.0f && !dComIfGp_event_runCheck() && sun_packet != NULL && sun_packet->mSunAlpha > 0.0f) {
if (g_env_light.daytime > 105.0f && g_env_light.daytime < 240.0f && !dComIfGp_event_runCheck() && sun_packet != NULL && sun_packet->mSunAlpha > 0.0f) {
mDoLib_project(&sun_packet->mPos[0], &proj);
if (proj.x > 0.0f && proj.x < 608.0f && proj.y > spC4 && proj.y < (458.0f - spC4)) {
pass = 0;
@@ -4631,9 +4631,9 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) {
}
for (j = 0; j < 3; j++) {
color.r = g_env_light.mVrShitaGumoCol.r;
color.g = g_env_light.mVrShitaGumoCol.g;
color.b = g_env_light.mVrShitaGumoCol.b;
color.r = g_env_light.vrbox_kumo_bottom_col.r;
color.g = g_env_light.vrbox_kumo_bottom_col.g;
color.b = g_env_light.vrbox_kumo_bottom_col.b;
GXColor color_reg1;
color_reg1.r = 0;
@@ -4736,9 +4736,9 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) {
} else {
f32 sp4C = 1.0f - vrkumo_packet->mVrkumoEff[k].mDistFalloff;
color.r = (f32)g_env_light.mVrkumoCol.r + (sp4C * ((f32)g_env_light.mVrShitaGumoCol.r - (f32)g_env_light.mVrkumoCol.r));
color.g = (f32)g_env_light.mVrkumoCol.g + (sp4C * ((f32)g_env_light.mVrShitaGumoCol.g - (f32)g_env_light.mVrkumoCol.g));
color.b = (f32)g_env_light.mVrkumoCol.b + (sp4C * ((f32)g_env_light.mVrShitaGumoCol.b - (f32)g_env_light.mVrkumoCol.b));
color.r = (f32)g_env_light.vrbox_kumo_top_col.r + (sp4C * ((f32)g_env_light.vrbox_kumo_bottom_col.r - (f32)g_env_light.vrbox_kumo_top_col.r));
color.g = (f32)g_env_light.vrbox_kumo_top_col.g + (sp4C * ((f32)g_env_light.vrbox_kumo_bottom_col.g - (f32)g_env_light.vrbox_kumo_top_col.g));
color.b = (f32)g_env_light.vrbox_kumo_top_col.b + (sp4C * ((f32)g_env_light.vrbox_kumo_bottom_col.b - (f32)g_env_light.vrbox_kumo_top_col.b));
color.a = 255.0f * vrkumo_packet->mVrkumoEff[k].mAlpha;
if (j == 1) {
@@ -5308,7 +5308,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
return;
}
if (envlight->field_0xf40 <= 0.0f || envlight->field_0xf3d != 1) {
if (envlight->senses_effect_strength <= 0.0f || envlight->now_senses_effect != 1) {
return;
}
@@ -5449,7 +5449,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
var_f31 = 1.0f;
}
f32 temp_f29 = var_f31 * (effect->field_0x28 * (effect->field_0x24 * (envlight->field_0xf40 * envlight->field_0xf40 * envlight->field_0xf40)));
f32 temp_f29 = var_f31 * (effect->field_0x28 * (effect->field_0x24 * (envlight->senses_effect_strength * envlight->senses_effect_strength * envlight->senses_effect_strength)));
if (effect->mStatus != 0) {
if (!(temp_f29 <= 0.000001f)) {
@@ -5557,7 +5557,7 @@ void dKyr_mud_move() {
}
if (g_env_light.field_0x1048 != 0) {
if (strcmp(dComIfGp_getStartStageName(), "D_MN05A") == 0 && g_env_light.mColPatCurr == 6) {
if (strcmp(dComIfGp_getStartStageName(), "D_MN05A") == 0 && g_env_light.wether_pat1 == 6) {
dComIfGs_PolyDamageOff_Set(1);
cLib_addCalc(&mud_packet->field_0x1c3c, 0.0f, 0.1f, 0.001f, 0.000001f);
} else {
@@ -5690,7 +5690,7 @@ void dKyr_mud_draw(Mtx drawMtx, u8** tex) {
GXColor color_reg1;
camera_class* sp34 = (camera_class*)dComIfGp_getCamera(0);
s16 spC = g_env_light.mTerrainAmbienceBG[1].a;
s16 spC = g_env_light.bg_amb_col[1].a;
dKankyo_sunlenz_Packet* lenz_packet = g_env_light.mpSunLenzPacket;
if (mud_packet->mEffectNum != 0) {
@@ -5701,9 +5701,9 @@ void dKyr_mud_draw(Mtx drawMtx, u8** tex) {
spC = g_env_light.field_0x1300;
}
sp50.r = 1.3f * g_env_light.mTerrainAmbienceBG[1].r;
sp50.g = 1.3f * g_env_light.mTerrainAmbienceBG[1].g;
sp50.b = 1.3f * g_env_light.mTerrainAmbienceBG[1].b;
sp50.r = 1.3f * g_env_light.bg_amb_col[1].r;
sp50.g = 1.3f * g_env_light.bg_amb_col[1].g;
sp50.b = 1.3f * g_env_light.bg_amb_col[1].b;
if (sp50.r >= 0xFF) {
sp50.r = 0xFF;
@@ -5728,9 +5728,9 @@ void dKyr_mud_draw(Mtx drawMtx, u8** tex) {
var_f31 = (u8)(var_f31 * (1.0f - (sun_packet->mVisibility * (1.0f - (lenz_packet->mDistFalloff * lenz_packet->mDistFalloff * lenz_packet->mDistFalloff)))));
}
color_reg1.r = 0.5f * g_env_light.mTerrainAmbienceBG[1].r;
color_reg1.g = 0.5f * g_env_light.mTerrainAmbienceBG[1].g;
color_reg1.b = 0.5f * g_env_light.mTerrainAmbienceBG[1].b;
color_reg1.r = 0.5f * g_env_light.bg_amb_col[1].r;
color_reg1.g = 0.5f * g_env_light.bg_amb_col[1].g;
color_reg1.b = 0.5f * g_env_light.bg_amb_col[1].b;
color_reg1.a = 0xFF;
if (strcmp(dComIfGp_getStartStageName(), "D_MN05A") == 0) {
@@ -5765,7 +5765,7 @@ void dKyr_mud_draw(Mtx drawMtx, u8** tex) {
return;
}
if (g_env_light.mCameraInWater == 0) {
if (g_env_light.camera_water_in_status == 0) {
for (int i = 0; i < 1; i++) {
GXTexObj texobj;
dKyr_set_btitex(&texobj, (ResTIMG*)tex[0]);
@@ -5784,7 +5784,7 @@ void dKyr_mud_draw(Mtx drawMtx, u8** tex) {
GXSetBlendMode(GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_SET);
GXSetAlphaCompare(GX_GREATER, 0, GX_AOP_OR, GX_GREATER, 0);
if (g_env_light.mCameraInWater != 0) {
if (g_env_light.camera_water_in_status != 0) {
GXSetZMode(GX_DISABLE, GX_LEQUAL, GX_ENABLE);
} else {
GXSetZMode(GX_ENABLE, GX_LEQUAL, GX_DISABLE);
src/d/d_kankyo_wether.cpp
+87 -87
View File
@@ -300,7 +300,7 @@ void dKyw_wether_init() {
g_env_light.mThunderEff.mStatus = 0;
g_env_light.mThunderEff.mMode = 0;
g_env_light.mRainInitialized = false;
g_env_light.mRainCount = 0;
g_env_light.raincnt = 0;
g_env_light.mSnowInitialized = false;
g_env_light.field_0xe92 = 0;
g_env_light.mSnowCount = 0;
@@ -326,7 +326,7 @@ void dKyw_wether_init() {
g_env_light.mEvilInitialized = 0;
g_env_light.field_0x1054 = 0;
g_env_light.field_0x1051 = 0;
g_env_light.field_0xe60 = 0.0f;
g_env_light.unk_0xe60 = 0.0f;
dKyw_wind_init();
dKyw_pntwind_init();
@@ -487,7 +487,7 @@ void dKyw_wether_move() {
/* 80058318-80058894 052C58 057C+00 1/1 0/0 0/0 .text wether_move_sun__Fv */
static void wether_move_sun() {
s32 sunVisible = false;
if (dComIfGp_checkStatus(1) && !g_env_light.mVrboxInvisible) {
if (dComIfGp_checkStatus(1) && !g_env_light.hide_vrbox) {
roomRead_class* room = dComIfGp_getStageRoom();
if (room != NULL && room->field_0x0 > dComIfGp_roomControl_getStayNo()) {
sunVisible = dStage_roomRead_dt_c_GetVrboxswitch(
@@ -542,7 +542,7 @@ static void wether_move_sun() {
g_env_light.mpSunPacket->field_0x64 = 0.0f;
g_env_light.mpSunPacket->mMoonAlpha = 0.0f;
if (g_env_light.mDaytime < 255.0f) {
if (g_env_light.daytime < 255.0f) {
g_env_light.mpSunPacket->field_0x6c = 1.0f;
} else {
g_env_light.mpSunPacket->field_0x6c = 0.0f;
@@ -590,7 +590,7 @@ static void wether_move_sun() {
static void wether_move_rain() {
switch (g_env_light.mRainInitialized) {
case FALSE:
if (g_env_light.mRainCount > 3) {
if (g_env_light.raincnt > 3) {
g_env_light.mpRainPacket = new (32) dKankyo_rain_Packet();
if (g_env_light.mpRainPacket != NULL) {
@@ -598,7 +598,7 @@ static void wether_move_rain() {
dKyr_rain_move();
g_env_light.mRainInitialized = 1;
if (g_env_light.mRainCount != 250) {
if (g_env_light.raincnt != 250) {
mDoAud_seStart(JA_SE_ATM_RAIN_START, NULL, 0, 0);
}
}
@@ -611,7 +611,7 @@ static void wether_move_rain() {
if (g_env_light.mSnowCount == 0 && cam != NULL) {
// Stage is not Fishing Pond
if (strcmp(dComIfGp_getStartStageName(), "R_SP127") || cam->lookat.eye.y > 0.0f) {
if (g_env_light.mRainCount < 125.0f) {
if (g_env_light.raincnt < 125.0f) {
mDoAud_rainPlay(FALSE);
} else {
mDoAud_rainPlay(TRUE);
@@ -619,7 +619,7 @@ static void wether_move_rain() {
}
}
if (g_env_light.mRainCount <= 3) {
if (g_env_light.raincnt <= 3) {
g_env_light.mRainInitialized = 0;
mDoAud_seStart(JA_SE_ATM_RAIN_END, NULL, 0, 0);
delete g_env_light.mpRainPacket;
@@ -657,7 +657,7 @@ static void wether_move_star() {
return;
} else {
// Stage is Hero Shade arena
if ((dComIfGp_checkStatus(1) && !g_env_light.mVrboxInvisible) ||
if ((dComIfGp_checkStatus(1) && !g_env_light.hide_vrbox) ||
!strcmp(dComIfGp_getStartStageName(), "F_SP200"))
{
roomRead_class* room = dComIfGp_getStageRoom();
@@ -690,7 +690,7 @@ static void wether_move_star() {
density = 0.0f;
}
if (g_env_light.mColPatCurr != 0 && g_env_light.mColPatBlend > 0.5f) {
if (g_env_light.wether_pat1 != 0 && g_env_light.pat_ratio > 0.5f) {
density = 0.0f;
}
@@ -758,7 +758,7 @@ static void wether_move_housi() {
(!strcmp(dComIfGp_getStartStageName(), "F_SP115") &&
dComIfGp_roomControl_getStayNo() == 1 && dComIfGp_getStartStageLayer() == 9))
{
if (g_env_light.mInitAnmTimer != 0) {
if (g_env_light.light_init_timer != 0) {
g_env_light.field_0xea9 = 0;
g_env_light.mHousiCount = 200;
@@ -790,7 +790,7 @@ static void wether_move_housi() {
g_env_light.mpHousiPacket->mpResTex = (u8*)dComIfG_getObjectRes("Always", 0x5E);
} else {
if (g_env_light.field_0xea9 == 2) {
if (g_env_light.mPondSeason == 3) {
if (g_env_light.fishing_hole_season == 3) {
g_env_light.mpHousiPacket->mpResTex =
(u8*)dComIfG_getStageRes("momiji64s3tc.bti");
} else {
@@ -914,7 +914,7 @@ static void wether_move_vrkumo() {
BOOL var_r31 = false;
static cXyz r09o(-180000.0f, 750.0f, -200000.0f);
if (dComIfGp_checkStatus(1) && !g_env_light.mVrboxInvisible) {
if (dComIfGp_checkStatus(1) && !g_env_light.hide_vrbox) {
g_env_light.mVrkumoCount = 6;
if (memcmp(dComIfGp_getStartStageName(), "D_MN07", 6) == 0 ||
@@ -926,15 +926,15 @@ static void wether_move_vrkumo() {
} else if (strcmp(dComIfGp_getStartStageName(), "F_SP104") == 0 &&
dComIfG_play_c::getLayerNo(0) >= 3)
{
if (g_env_light.mColPatCurr >= 4) {
if (g_env_light.wether_pat1 >= 4) {
cLib_addCalc(&g_env_light.mVrkumoStrength, 1.0f, 0.1f, 0.003f, 0.0000001f);
} else {
cLib_addCalc(&g_env_light.mVrkumoStrength, 0.0f, 0.08f, 0.002f, 0.00000001f);
}
} else if ((g_env_light.mColPatCurr == 1 && g_env_light.mColPatBlend > 0.0f) ||
(g_env_light.mColPatPrev == 1 && g_env_light.mColPatBlend < 1.0f) ||
(g_env_light.mColPatCurr == 2 && g_env_light.mColPatBlend > 0.0f) ||
(g_env_light.mColPatPrev == 2 && g_env_light.mColPatBlend < 1.0f))
} else if ((g_env_light.wether_pat1 == 1 && g_env_light.pat_ratio > 0.0f) ||
(g_env_light.wether_pat0 == 1 && g_env_light.pat_ratio < 1.0f) ||
(g_env_light.wether_pat1 == 2 && g_env_light.pat_ratio > 0.0f) ||
(g_env_light.wether_pat0 == 2 && g_env_light.pat_ratio < 1.0f))
{
cLib_addCalc(&g_env_light.mVrkumoStrength, 1.0f, 0.1f, 0.003f, 0.0000001f);
} else {
@@ -1000,10 +1000,10 @@ static void wether_move_vrkumo() {
dKyw_get_wind_vec();
cXyz sp8;
f32 wind_vec_x = g_env_light.mWind.vec.x;
f32 wind_vec_y = g_env_light.mWind.vec.y;
f32 wind_vec_z = g_env_light.mWind.vec.z;
f32 var_f31 = g_env_light.mWind.pow;
f32 wind_vec_x = g_env_light.global_wind_influence.vec.x;
f32 wind_vec_y = g_env_light.global_wind_influence.vec.y;
f32 wind_vec_z = g_env_light.global_wind_influence.vec.z;
f32 var_f31 = g_env_light.global_wind_influence.pow;
if (strcmp(dComIfGp_getStartStageName(), "R_SP127") == 0) {
var_f31 = 0.3f;
@@ -1097,7 +1097,7 @@ static void wether_move_evil() {
/* 8005A0B8-8005A154 0549F8 009C+00 0/0 1/1 0/0 .text dKyw_wether_move_draw__Fv */
void dKyw_wether_move_draw() {
g_env_light.mMoyaSE = 0;
g_env_light.moya_se = 0;
if (strcmp(dComIfGp_getStartStageName(), "Name")) {
wether_move_sun();
@@ -1182,16 +1182,16 @@ void dKyw_wether_proc() {
if (!strcmp(dComIfGp_getStartStageName(), "F_SP108") ||
!strcmp(dComIfGp_getStartStageName(), "F_SP127") ||
(!strcmp(dComIfGp_getStartStageName(), "F_SP121") &&
g_env_light.mDiceWeatherTime != 0.0f))
g_env_light.dice_wether_time != 0.0f))
{
if (!dKy_darkworld_check()) {
// Stage is Hyrule Field
if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") ||
!(g_env_light.mDaytime >= 75.0f) || !(g_env_light.mDaytime <= 120.0f))
!(g_env_light.daytime >= 75.0f) || !(g_env_light.daytime <= 120.0f))
{
// Stage is Hyrule Field
if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") &&
g_env_light.mDiceWeatherMode >= 1 && g_env_light.mDiceWeatherMode < 6)
g_env_light.dice_wether_mode >= 1 && g_env_light.dice_wether_mode < 6)
{
dKy_get_dayofweek();
lbl1:
@@ -1212,9 +1212,9 @@ lbl1:
// Stage is Fishing Pond
if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") &&
(g_env_light.mPondSeason == 1 || g_env_light.mPondSeason == 3))
(g_env_light.fishing_hole_season == 1 || g_env_light.fishing_hole_season == 3))
{
if (g_env_light.mPondSeason == 1) {
if (g_env_light.fishing_hole_season == 1) {
g_env_light.mHousiCount = 35;
} else {
g_env_light.mHousiCount = 30;
@@ -1226,17 +1226,17 @@ lbl1:
/* 8005A57C-8005A5C0 054EBC 0044+00 1/1 0/0 0/0 .text dKyw_wind_init__Fv */
static void dKyw_wind_init() {
g_env_light.mWind.vec.x = -1.0f;
g_env_light.mWind.vec.y = 0.0f;
g_env_light.mWind.vec.z = 0.0f;
g_env_light.mWind.pow = 0.0f;
g_env_light.field_0xe6c = 0;
g_env_light.field_0xe64 = 0;
g_env_light.field_0xe66 = 0;
g_env_light.mWind.vec_override = 0;
g_env_light.global_wind_influence.vec.x = -1.0f;
g_env_light.global_wind_influence.vec.y = 0.0f;
g_env_light.global_wind_influence.vec.z = 0.0f;
g_env_light.global_wind_influence.pow = 0.0f;
g_env_light.unk_0xe6c = 0;
g_env_light.unk_0xe64 = 0;
g_env_light.unk_0xe66 = 0;
g_env_light.global_wind_influence.vec_override = NULL;
g_env_light.custom_windpower = 0.0f;
g_env_light.mEvtWindSet = 0;
g_env_light.mTeachWindExist = 0;
g_env_light.evt_wind_go = 0;
g_env_light.TeachWind_existence = 0;
}
/* 8005A5C0-8005AAE0 054F00 0520+00 0/0 2/2 0/0 .text dKyw_wind_set__Fv */
@@ -1248,8 +1248,8 @@ void dKyw_wind_set() {
cXyz wind_vec;
f32 strength;
if (g_env_light.mWind.vec_override != NULL) {
wind_vec = *g_env_light.mWind.vec_override;
if (g_env_light.global_wind_influence.vec_override != NULL) {
wind_vec = *g_env_light.global_wind_influence.vec_override;
strength = g_env_light.custom_windpower;
cM_atan2s(wind_vec.x, wind_vec.z);
@@ -1305,9 +1305,9 @@ void dKyw_wind_set() {
break;
}
if (g_env_light.mEvtWindSet != 0 && g_env_light.mEvtWindSet != 0xFF) {
var_r30 = g_env_light.mEvtWindAngleX;
var_r29 = g_env_light.mEvtWindAngleY;
if (g_env_light.evt_wind_go != 0 && g_env_light.evt_wind_go != 0xFF) {
var_r30 = g_env_light.evt_wind_angle_x;
var_r29 = g_env_light.evt_wind_angle_y;
}
wind_vec.x = cM_scos(var_r30) * cM_ssin(var_r29);
@@ -1348,7 +1348,7 @@ void dKyw_wind_set() {
}
}
if (g_env_light.mEvtWindSet != 0) {
if (g_env_light.evt_wind_go != 0) {
strength = g_env_light.custom_windpower;
}
@@ -1371,30 +1371,30 @@ void dKyw_wind_set() {
mDoAud_mEnvse_startStrongWindSe(reverb);
}
if (g_env_light.mInitAnmTimer != 0) {
g_env_light.mWind.vec = wind_vec;
g_env_light.mWind.pow = strength;
if (g_env_light.light_init_timer != 0) {
g_env_light.global_wind_influence.vec = wind_vec;
g_env_light.global_wind_influence.pow = strength;
} else {
cLib_addCalc(&g_env_light.mWind.vec.x, wind_vec.x, 0.05f, 2.0f, 0.001f);
cLib_addCalc(&g_env_light.mWind.vec.y, wind_vec.y, 0.05f, 2.0f, 0.001f);
cLib_addCalc(&g_env_light.mWind.vec.z, wind_vec.z, 0.05f, 2.0f, 0.001f);
cLib_addCalc(&g_env_light.mWind.pow, strength, 0.05f, 1.0f, 0.005f);
cLib_addCalc(&g_env_light.global_wind_influence.vec.x, wind_vec.x, 0.05f, 2.0f, 0.001f);
cLib_addCalc(&g_env_light.global_wind_influence.vec.y, wind_vec.y, 0.05f, 2.0f, 0.001f);
cLib_addCalc(&g_env_light.global_wind_influence.vec.z, wind_vec.z, 0.05f, 2.0f, 0.001f);
cLib_addCalc(&g_env_light.global_wind_influence.pow, strength, 0.05f, 1.0f, 0.005f);
}
}
/* 8005AAE0-8005AAF0 055420 0010+00 1/1 6/6 7/7 .text dKyw_get_wind_vec__Fv */
cXyz* dKyw_get_wind_vec() {
return &g_env_light.mWind.vec;
return &g_env_light.global_wind_influence.vec;
}
/* 8005AAF0-8005AB00 055430 0010+00 1/1 6/6 8/8 .text dKyw_get_wind_pow__Fv */
f32 dKyw_get_wind_pow() {
return g_env_light.mWind.pow;
return g_env_light.global_wind_influence.pow;
}
/* 8005AB00-8005AB64 055440 0064+00 0/0 8/8 3/3 .text dKyw_get_wind_vecpow__Fv */
cXyz dKyw_get_wind_vecpow() {
cXyz vec = g_env_light.mWind.vec * g_env_light.mWind.pow;
cXyz vec = g_env_light.global_wind_influence.vec * g_env_light.global_wind_influence.pow;
return vec;
}
@@ -1404,13 +1404,13 @@ void dKyw_plight_collision_set(cXyz* param_0, s16 param_1, s16 param_2, f32 para
dScnKy_env_light_c* env_light = dKy_getEnvlight();
for (int i = 0; i < 5; i++) {
if (!env_light->mWindInfluenceEntity[i].mInUse) {
env_light->mWindInfluenceEntity[i].mInUse = true;
env_light->mWindInfluenceEntity[i].mMinRadius = param_4;
env_light->mWindInfluenceEntity[i].mSpeed = param_6;
env_light->mWindInfluenceEntity[i].mStrengthMaxVel = param_7;
if (!env_light->wind_inf_entity[i].mInUse) {
env_light->wind_inf_entity[i].mInUse = true;
env_light->wind_inf_entity[i].mMinRadius = param_4;
env_light->wind_inf_entity[i].mSpeed = param_6;
env_light->wind_inf_entity[i].mStrengthMaxVel = param_7;
WIND_INFLUENCE* wind_inf = &env_light->mWindInfluenceEntity[i].mInfluence;
WIND_INFLUENCE* wind_inf = &env_light->wind_inf_entity[i].mInfluence;
wind_inf->position = *param_0;
wind_inf->mDirection.x = cM_scos(param_1) * cM_ssin(param_2);
wind_inf->mDirection.y = cM_ssin(param_1);
@@ -1431,28 +1431,28 @@ static void squal_proc() {
WIND_INFLUENCE* influence;
for (int i = 0; i < 5; i++) {
influence = &env_light->mWindInfluenceEntity[i].mInfluence;
switch (env_light->mWindInfluenceEntity[i].mInUse) {
influence = &env_light->wind_inf_entity[i].mInfluence;
switch (env_light->wind_inf_entity[i].mInUse) {
case 0:
break;
case 1:
influence->position.x +=
influence->mDirection.x * env_light->mWindInfluenceEntity[i].mSpeed;
influence->mDirection.x * env_light->wind_inf_entity[i].mSpeed;
influence->position.y +=
influence->mDirection.y * env_light->mWindInfluenceEntity[i].mSpeed;
influence->mDirection.y * env_light->wind_inf_entity[i].mSpeed;
influence->position.z +=
influence->mDirection.z * env_light->mWindInfluenceEntity[i].mSpeed;
influence->mDirection.z * env_light->wind_inf_entity[i].mSpeed;
cLib_addCalc(&influence->mStrength, 0.0f, 0.2f,
env_light->mWindInfluenceEntity[i].mStrengthMaxVel, 0.001f);
env_light->wind_inf_entity[i].mStrengthMaxVel, 0.001f);
f32 speed = 1.0f - influence->mStrength;
f32 target = env_light->mWindInfluenceEntity[i].mMinRadius;
f32 target = env_light->wind_inf_entity[i].mMinRadius;
cLib_addCalc(&influence->mRadius, target, speed, speed * target * 0.05f, 0.01f);
if (influence->mStrength < 0.01f) {
dKyw_pntwind_cut(influence);
env_light->mWindInfluenceEntity[i].mInUse = false;
env_light->wind_inf_entity[i].mInUse = false;
}
break;
}
@@ -1462,11 +1462,11 @@ static void squal_proc() {
/* 8005AD44-8005AD98 055684 0054+00 1/1 0/0 0/0 .text dKyw_pntwind_init__Fv */
static void dKyw_pntwind_init() {
for (int i = 0; i < 30; i++) {
g_env_light.mPntWind[i] = NULL;
g_env_light.pntwind[i] = NULL;
}
for (int i = 0; i < 5; i++) {
g_env_light.mWindInfluenceEntity[i].mInUse = 0;
g_env_light.wind_inf_entity[i].mInUse = 0;
}
}
@@ -1474,9 +1474,9 @@ static void dKyw_pntwind_init() {
static void pntwind_set(WIND_INFLUENCE* i_pntwind) {
int i = 0;
for (; i < 30; i++) {
if (g_env_light.mPntWind[i] == NULL) {
g_env_light.mPntWind[i] = i_pntwind;
g_env_light.mPntWind[i]->field_0x24 = i;
if (g_env_light.pntwind[i] == NULL) {
g_env_light.pntwind[i] = i_pntwind;
g_env_light.pntwind[i]->field_0x24 = i;
break;
}
}
@@ -1503,7 +1503,7 @@ static void dKyw_pntlight_set(WIND_INFLUENCE* i_pntwind) {
/* 8005AE58-8005AE90 055798 0038+00 1/1 0/0 5/5 .text dKyw_pntwind_cut__FP14WIND_INFLUENCE */
void dKyw_pntwind_cut(WIND_INFLUENCE* i_pntwind) {
if (i_pntwind != NULL && i_pntwind->field_0x24 >= 0 && i_pntwind->field_0x24 < 30) {
g_env_light.mPntWind[i_pntwind->field_0x24] = NULL;
g_env_light.pntwind[i_pntwind->field_0x24] = NULL;
}
}
@@ -1516,9 +1516,9 @@ static void pntwind_get_info(cXyz* param_0, cXyz* i_dir, f32* i_power, u8 param_
*i_power = 0.0f;
WIND_INFLUENCE* influence;
s32 influence_count = ARRAY_SIZE(g_env_light.mPntWind);
s32 influence_count = ARRAY_SIZE(g_env_light.pntwind);
for (int i = 0; i < influence_count; i++) {
influence = g_env_light.mPntWind[i];
influence = g_env_light.pntwind[i];
if (influence != NULL && influence->field_0x29 == param_3) {
f32 dist = param_0->abs(influence->position);
@@ -1600,7 +1600,7 @@ void dKyw_get_AllWind_vec(cXyz* i_position, cXyz* i_direction, f32* i_power) {
cXyz sp30;
cXyz sp24;
sp30 = env_light->mWind.vec * (env_light->mWind.pow * (1.0f - *i_power));
sp30 = env_light->global_wind_influence.vec * (env_light->global_wind_influence.pow * (1.0f - *i_power));
sp24 = *i_direction * (*i_power * 5.0f);
sp54 = sp30 + sp24;
*i_power = sp54.abs();
@@ -1611,9 +1611,9 @@ void dKyw_get_AllWind_vec(cXyz* i_position, cXyz* i_direction, f32* i_power) {
i_direction->y = sp54.y;
i_direction->z = sp54.z;
} else {
i_direction->x = env_light->mWind.vec.x;
i_direction->y = env_light->mWind.vec.y;
i_direction->z = env_light->mWind.vec.z;
i_direction->x = env_light->global_wind_influence.vec.x;
i_direction->y = env_light->global_wind_influence.vec.y;
i_direction->z = env_light->global_wind_influence.vec.z;
}
}
@@ -1626,7 +1626,7 @@ cXyz dKyw_get_AllWind_vecpow(cXyz* param_0) {
cXyz sp30;
dKyw_pntwind_get_info(param_0, &sp30, &sp8);
sp18 = g_env_light.mWind.vec * (g_env_light.mWind.pow * (1.0f - sp8));
sp18 = g_env_light.global_wind_influence.vec * (g_env_light.global_wind_influence.pow * (1.0f - sp8));
sp24 = sp30 * (5.0f * sp8);
spC = sp18 + sp24;
@@ -1640,18 +1640,18 @@ void dKyw_custom_windpower(f32 pow) {
/* 8005B61C-8005B638 055F5C 001C+00 0/0 0/0 6/6 .text dKyw_evt_wind_set__Fss */
void dKyw_evt_wind_set(s16 angleX, s16 angleY) {
g_env_light.mEvtWindSet = 1;
g_env_light.mEvtWindAngleX = angleX;
g_env_light.mEvtWindAngleY = angleY;
g_env_light.evt_wind_go = 1;
g_env_light.evt_wind_angle_x = angleX;
g_env_light.evt_wind_angle_y = angleY;
}
/* 8005B638-8005B64C 055F78 0014+00 0/0 0/0 3/3 .text dKyw_evt_wind_set_go__Fv */
void dKyw_evt_wind_set_go() {
g_env_light.mEvtWindSet = 1;
g_env_light.evt_wind_go = 1;
}
/* 8005B64C-8005B660 055F8C 0014+00 0/0 1/1 5/5 .text dKyw_rain_set__Fi */
void dKyw_rain_set(int count) {
g_env_light.mRainCount = count;
g_env_light.mRainCountOrig = count;
g_env_light.raincnt = count;
g_env_light.base_raincnt = count;
}
src/d/d_kyeff.cpp
+3 -3
View File
@@ -57,9 +57,9 @@ static int dKyeff_Create(kankyo_class* i_this) {
dKyw_wether_init();
if (!strcmp(dComIfGp_getStartStageName(), "Name")) {
OSTicksToCalendarTime(OSGetTime(), &time);
g_env_light.mWind.vec.set(1.0f, 0.0f, 0.0f);
g_env_light.mWind.pow = 0.7f;
g_env_light.mDaytime = time.hours * 15.0f;
g_env_light.global_wind_influence.vec.set(1.0f, 0.0f, 0.0f);
g_env_light.global_wind_influence.pow = 0.7f;
g_env_light.daytime = time.hours * 15.0f;
}
return cPhs_COMPLEATE_e;
src/d/d_model.cpp
+3 -3
View File
@@ -31,8 +31,8 @@ void dMdl_c::draw() {
mpModelData->getMaterialNodePointer(mMaterialId)->loadSharedDL();
shape->loadPreDrawSetting();
GXColor amb_color = {mpTevstr->mColorC0.r, mpTevstr->mColorC0.g, mpTevstr->mColorC0.b,
mpTevstr->mColorC0.a};
GXColor amb_color = {mpTevstr->AmbCol.r, mpTevstr->AmbCol.g, mpTevstr->AmbCol.b,
mpTevstr->AmbCol.a};
GXSetChanAmbColor(GX_COLOR0A0, amb_color);
GXSetChanMatColor(GX_COLOR0A0, g_whiteColor);
dKy_setLight_nowroom_actor(mpTevstr);
@@ -145,4 +145,4 @@ dMdl_c* dMdl_mng_c::entry(J3DModelData* i_modelData, u16 i_materialId, int i_roo
dMdl_c::dMdl_c() {
mpModelData = NULL;
mMaterialId = 0;
}
}
src/d/d_particle.cpp
+37 -37
View File
@@ -226,16 +226,16 @@ static void initiateLighting8(_GXColor& param_0, s16 param_1) {
color0.b = b = (param_1 >> 9) & 0x3e;
if (daPy_py_c::checkNowWolfPowerUp()) {
f32 fVar2;
f32 fVar1 = (g_env_light.mTerrainAmbienceBG[0].r / 255.0f);
f32 fVar1 = (g_env_light.bg_amb_col[0].r / 255.0f);
fVar2 = r + 0x10;
color0.r = fVar2 * (4.0f * (fVar1));
fVar2 = (g_env_light.mTerrainAmbienceBG[0].g / 255.0f);
fVar2 = (g_env_light.bg_amb_col[0].g / 255.0f);
fVar1 = g + 0x10;
color0.g = fVar1 * (4.0f * (fVar2));
fVar1 = b + 0x10;
fVar2 = (g_env_light.mTerrainAmbienceBG[0].b / 255.0f);
fVar2 = (g_env_light.bg_amb_col[0].b / 255.0f);
color0.b = fVar1 * (4.0f * (fVar2));
}
@@ -287,10 +287,10 @@ static void drawSecond_light8(JPABaseEmitter* param_0) {
GXSetBlendMode(GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_SET);
GXSetNumChans(1);
GXColor local_14;
local_14.r = g_env_light.mTerrainAmbienceBG[0].r;
local_14.g = g_env_light.mTerrainAmbienceBG[0].g;
local_14.b = g_env_light.mTerrainAmbienceBG[0].b;
local_14.a = g_env_light.mTerrainAmbienceBG[0].a;
local_14.r = g_env_light.bg_amb_col[0].r;
local_14.g = g_env_light.bg_amb_col[0].g;
local_14.b = g_env_light.bg_amb_col[0].b;
local_14.a = g_env_light.bg_amb_col[0].a;
initiateLighting8(local_14, sVar3);
GXSetNumTexGens(1);
GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 0x3c, false, 0x7d);
@@ -315,15 +315,15 @@ static void drawSecond_b_light8(JPABaseEmitter* param_0) {
GXSetNumChans(1);
GXColor local_18;
if (param_0->getUserWork() == 0) {
local_18.r = envLight->mActorAmbience.r;
local_18.g = envLight->mActorAmbience.g;
local_18.b = envLight->mActorAmbience.b;
local_18.a = envLight->mActorAmbience.a;
local_18.r = envLight->actor_amb_col.r;
local_18.g = envLight->actor_amb_col.g;
local_18.b = envLight->actor_amb_col.b;
local_18.a = envLight->actor_amb_col.a;
} else {
local_18.r = envLight->mTerrainAmbienceBG[0].r;
local_18.g = envLight->mTerrainAmbienceBG[0].g;
local_18.b = envLight->mTerrainAmbienceBG[0].b;
local_18.a = envLight->mTerrainAmbienceBG[0].a;
local_18.r = envLight->bg_amb_col[0].r;
local_18.g = envLight->bg_amb_col[0].g;
local_18.b = envLight->bg_amb_col[0].b;
local_18.a = envLight->bg_amb_col[0].a;
}
initiate_b_Lighting8(local_18);
GXSetNumTevStages(2);
@@ -528,27 +528,27 @@ bool dPa_modelEcallBack::model_c::set(J3DModelData* param_0, dKy_tevstr_c const&
typedef struct Arr{
int field_0x0[2];
};
*(Arr*)&field_0x8.mColorC0 = *(Arr*)&param_1.mColorC0;
*(Arr*)&field_0x8.mColorK0 = *(Arr*)&param_1.mColorK0;
*(Arr*)&field_0x8.mFogColor = *(Arr*)&param_1.mFogColor;
*(int*)&field_0x8.field_0x360 = *(int*)&param_1.field_0x360;
*(Arr*)&field_0x8.AmbCol = *(Arr*)&param_1.AmbCol;
*(Arr*)&field_0x8.FogCol = *(Arr*)&param_1.FogCol;
*(Arr*)&field_0x8.TevColor = *(Arr*)&param_1.TevColor;
*(int*)&field_0x8.TevKColor = *(int*)&param_1.TevKColor;
*(int*)&field_0x8.mLightInf = *(int*)&param_1.mLightInf;
field_0x8.mFogStartZ = param_1.mFogStartZ;
field_0x8.mFogEndZ = param_1.mFogEndZ;
field_0x8.mColpatBlend = param_1.mColpatBlend;
field_0x8.pat_ratio = param_1.pat_ratio;
field_0x8.field_0x374 = param_1.field_0x374;
field_0x8.field_0x378 = param_1.field_0x378;
field_0x8.field_0x37a = param_1.field_0x37a;
field_0x8.Material_id = param_1.Material_id;
field_0x8.Type = param_1.Type;
field_0x8.mInitTimer = param_1.mInitTimer;
field_0x8.mEnvrIdxCurr = param_1.mEnvrIdxCurr;
field_0x8.mEnvrIdxPrev = param_1.mEnvrIdxPrev;
field_0x8.mColpatCurr = param_1.mColpatCurr;
field_0x8.mColpatPrev = param_1.mColpatPrev;
field_0x8.mRoomNo = param_1.mRoomNo;
field_0x8.mEnvrIdxOverride = param_1.mEnvrIdxOverride;
field_0x8.UseCol = param_1.UseCol;
field_0x8.PrevCol = param_1.PrevCol;
field_0x8.wether_pat1 = param_1.wether_pat1;
field_0x8.wether_pat0 = param_1.wether_pat0;
field_0x8.room_no = param_1.room_no;
field_0x8.YukaCol = param_1.YukaCol;
field_0x8.mLightMode = param_1.mLightMode;
field_0x8.mInitType = param_1.mInitType;
field_0x8.Material_use_fg = param_1.Material_use_fg;
field_0x8.field_0x384 = param_1.field_0x384;
field_0x8.field_0x385 = param_1.field_0x385;
mRotAxis = rotAxis;
@@ -838,7 +838,7 @@ u32 dPa_simpleEcallBack::set(cXyz const* param_1, dKy_tevstr_c const* param_2, u
_GXColor const& param_4, _GXColor const& param_5, int param_6,
f32 param_7) {
f32 dVar7 = param_7;
if (param_2 != NULL && param_2->mInitType != 124) {
if (param_2 != NULL && param_2->Material_use_fg != 124) {
OS_REPORT("\x1b[43;30mSimple Particle tevstr nonset !!\n");
return 0;
}
@@ -895,8 +895,8 @@ u32 dPa_simpleEcallBack::set(cXyz const* param_1, dKy_tevstr_c const* param_2, u
}
dKy_ParticleColor_get_bg((cXyz*)param_1, (dKy_tevstr_c*)param_2, &local_6c, &local_70, &local_74, &local_78,
dVar7);
dVar7 = g_env_light.mPaletteTerrainLightEffect +
(1.0f - g_env_light.mPaletteTerrainLightEffect) * dVar7;
dVar7 = g_env_light.bg_light_influence +
(1.0f - g_env_light.bg_light_influence) * dVar7;
OS_REPORT("\nwork__ratio=[%f]", dVar7);
local_6c = dKy_light_influence_col(&local_6c, dVar7);
local_70 = dKy_light_influence_col(&local_70, dVar7);
@@ -1505,7 +1505,7 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* param_2,
}
u32 local_ac = local_a8->getResUserWork(param_1);
if (param_3 != NULL && param_3->mInitType != 0x7c) {
if (param_3 != NULL && param_3->Material_use_fg != 0x7c) {
return NULL;
}
@@ -1591,7 +1591,7 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* param_2,
}
dKy_ParticleColor_get_bg((cXyz*)param_2, (dKy_tevstr_c*)param_3, &local_c0,
&local_c4, &local_c8, &local_cc, param_12);
param_12 = g_env_light.mPaletteTerrainLightEffect + (1.0f - g_env_light.mPaletteTerrainLightEffect) * param_12;
param_12 = g_env_light.bg_light_influence + (1.0f - g_env_light.bg_light_influence) * param_12;
local_c0 = dKy_light_influence_col(&local_c0, param_12);
local_c4 = dKy_light_influence_col(&local_c4, param_12);
this_00->setGlobalEnvColor(local_c0.r, local_c0.g, local_c0.b);
@@ -1734,7 +1734,7 @@ static void dPa_kankyocolor_set(f32 param_0, JPABaseEmitter* param_1,
}
dKy_ParticleColor_get_bg((cXyz*)param_4, (dKy_tevstr_c*)param_2, &local_70, &local_74,
&local_78, &local_7c, fVar1);
fVar1 = g_env_light.mPaletteTerrainLightEffect + (1.0f - g_env_light.mPaletteTerrainLightEffect) * fVar1;
fVar1 = g_env_light.bg_light_influence + (1.0f - g_env_light.bg_light_influence) * fVar1;
local_70 = dKy_light_influence_col(&local_70, fVar1);
//_GXColor::operator_ = (&local_70, (_GXColor*)&local_80);
local_74 = dKy_light_influence_col(&local_74, fVar1);
@@ -1966,8 +1966,8 @@ void dPa_wbPcallBack_c::execute(JPABaseEmitter* param_0, JPABaseParticle* param_
/* 8004DCA0-8004DD0C 0485E0 006C+00 1/0 0/0 0/0 .text
* execute__19dPa_fsenthPcallBackFP14JPABaseEmitterP15JPABaseParticle */
void dPa_fsenthPcallBack::execute(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
if (g_env_light.field_0xf3d == 1 && g_env_light.field_0xf40 > 0.0f) {
param_0->setGlobalAlpha(255.0f * g_env_light.field_0xf40);
if (g_env_light.now_senses_effect == 1 && g_env_light.senses_effect_strength > 0.0f) {
param_0->setGlobalAlpha(255.0f * g_env_light.senses_effect_strength);
param_0->playDrawParticle();
} else {
param_0->setGlobalAlpha(0);
src/d/d_resorce.cpp
+1 -1
View File
@@ -262,7 +262,7 @@ J3DModelData* dRes_info_c::loaderBasicBmd(u32 i_tag, void* i_data) {
for (i = 0; i < modelData->getMaterialNum(); i++) {
material = modelData->getMaterialNodePointer(i);
lightMask = material->getColorChan(0)->getLightMask();
switch (g_env_light.field_0x1308) {
switch (g_env_light.light_mask_type) {
case 1:
lightMask &= 0x4;
break;
src/d/d_s_play.cpp
+4 -4
View File
@@ -503,15 +503,15 @@ static int phase_1(dScnPly_c* i_this) {
if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") && dComIfGp_getStartStageRoomNo() == 0 &&
dComIfGp_getStartStagePoint() == 2)
{
g_env_light.mPondSeason++;
g_env_light.fishing_hole_season++;
if (g_env_light.mPondSeason > 4) {
g_env_light.mPondSeason = 1;
if (g_env_light.fishing_hole_season > 4) {
g_env_light.fishing_hole_season = 1;
}
}
dComIfGs_BossLife_public_Set(0xFF);
g_env_light.field_0x1308 = 0;
g_env_light.light_mask_type = 0;
JUTReportConsole_f("Start StageName:RoomNo [%s:%d]\n", dComIfGp_getStartStageName(),
dComIfGp_getStartStageRoomNo());