summaryrefslogtreecommitdiff
path: root/src/d
diff options
context:
space:
mode:
Diffstat (limited to 'src/d')
-rw-r--r--src/d/a/d_a_alink.cpp8
-rw-r--r--src/d/a/d_a_npc.cpp2
-rw-r--r--src/d/com/d_com_inf_game.cpp20
-rw-r--r--src/d/d_stage.cpp6
-rw-r--r--src/d/kankyo/d_kankyo.cpp12
-rw-r--r--src/d/kankyo/d_kankyo_data.cpp562
-rw-r--r--src/d/kankyo/d_kankyo_wether.cpp12
-rw-r--r--src/d/s/d_s_play.cpp34
8 files changed, 400 insertions, 256 deletions
diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp
index eb5ad4b06e..8ae6634ed3 100644
--- a/src/d/a/d_a_alink.cpp
+++ b/src/d/a/d_a_alink.cpp
@@ -12656,19 +12656,19 @@ int daAlink_c::create() {
mAttentionInfo.mFlags = -1;
if (!i_dComIfGp_getEventManager().dataLoaded()) {
- return cPhs_ZERO_e;
+ return cPhs_INIT_e;
}
setArcName(i_checkWolf());
setOriginalHeap(&field_0x0638, 0xA2800);
if (dComIfG_resLoad(&mPhaseReq, mArcName, field_0x0638) != cPhs_COMPLEATE_e) {
- return cPhs_ZERO_e;
+ return cPhs_INIT_e;
}
setShieldArcName();
setOriginalHeap(&field_0x0648, 0x7000);
if (dComIfG_resLoad(&mShieldPhaseReq, mShieldArcName, field_0x0648) != cPhs_COMPLEATE_e) {
- return cPhs_ZERO_e;
+ return cPhs_INIT_e;
}
if (!fopAcM_entrySolidHeap(this, daAlink_createHeap, 0xC003E930)) {
@@ -12708,7 +12708,7 @@ int daAlink_c::create() {
!fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchLightBall, NULL)) ||
(horseStart && i_dComIfGp_getHorseActor() == NULL))
{
- return cPhs_ZERO_e;
+ return cPhs_INIT_e;
}
if (var_r24) {
diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp
index 4ff19fe4a0..f8e0aeecf0 100644
--- a/src/d/a/d_a_npc.cpp
+++ b/src/d/a/d_a_npc.cpp
@@ -1697,7 +1697,7 @@ int daNpcT_c::loadRes(s8 const* resNoList, char const** resNameList) {
}
}
- return cPhs_ZERO_e;
+ return cPhs_INIT_e;
}
/* 801484AC-8014852C 142DEC 0080+00 0/0 0/0 58/58 .text deleteRes__8daNpcT_cFPCScPPCc */
diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp
index 34e31291e3..a3071c2e2d 100644
--- a/src/d/com/d_com_inf_game.cpp
+++ b/src/d/com/d_com_inf_game.cpp
@@ -1026,7 +1026,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.field_0x12fe) {
+ switch (g_env_light.mPondSeason) {
case 1:
o_layer = 0;
break;
@@ -1270,7 +1270,7 @@ static int phase_1(char* i_arcName) {
return cPhs_ERROR_e;
}
- return cPhs_TWO_e;
+ return cPhs_NEXT_e;
}
/* 8002CE38-8002CEB4 027778 007C+00 1/0 0/0 0/0 .text phase_2__FPc */
@@ -1296,7 +1296,7 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_arcNa
static int (*l_method[3])(void*) = {(int (*)(void*))phase_1, (int (*)(void*))phase_2,
(int (*)(void*))phase_3};
- if (i_phase->id == cPhs_TWO_e) {
+ if (i_phase->id == cPhs_NEXT_e) {
return cPhs_COMPLEATE_e;
}
@@ -1333,7 +1333,7 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_resNa
static int (*l_method[3])(void*) = {(int (*)(void*))phase_01, (int (*)(void*))phase_02,
(int (*)(void*))phase_03};
- if (i_phase->id == cPhs_TWO_e) {
+ if (i_phase->id == cPhs_NEXT_e) {
return cPhs_COMPLEATE_e;
}
@@ -1344,12 +1344,12 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_resNa
/* 8002D008-8002D06C 027948 0064+00 1/1 10/10 540/540 .text
* dComIfG_resDelete__FP30request_of_phase_process_classPCc */
int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* i_resName) {
- if (i_phase->id != cPhs_TWO_e) {
+ if (i_phase->id != cPhs_NEXT_e) {
return 0;
}
dComIfG_deleteObjectResMain(i_resName);
- i_phase->id = cPhs_ZERO_e;
+ i_phase->id = cPhs_INIT_e;
return 1;
}
@@ -2184,7 +2184,7 @@ void dComIfGs_setWarpMarkFlag(u8) {}
/* 8002F314-8002F328 029C54 0014+00 0/0 0/0 1/1 .text __ct__19dComIfG_resLoader_cFv */
dComIfG_resLoader_c::dComIfG_resLoader_c() {
field_0x0 = NULL;
- field_0x4.id = cPhs_ZERO_e;
+ field_0x4.id = cPhs_INIT_e;
field_0xc = 0;
}
@@ -2193,7 +2193,7 @@ dComIfG_resLoader_c::~dComIfG_resLoader_c() {
if (field_0x0 != NULL) {
for (int i = field_0xc; i >= 0; i--) {
dComIfG_resDelete(&field_0x4, field_0x0[i]);
- field_0x4.id = cPhs_TWO_e;
+ field_0x4.id = cPhs_NEXT_e;
}
}
}
@@ -2206,8 +2206,8 @@ int dComIfG_resLoader_c::load(char const** i_resNameTbl, JKRHeap* i_heap) {
if (phase_state == cPhs_COMPLEATE_e) {
if (field_0x0[field_0xc + 1][0] != 0) {
field_0xc++;
- field_0x4.id = cPhs_ZERO_e;
- phase_state = cPhs_ZERO_e;
+ field_0x4.id = cPhs_INIT_e;
+ phase_state = cPhs_INIT_e;
}
}
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index 2022567071..c3d6f0d846 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -2809,11 +2809,11 @@ static void layerTableLoader(void* i_data, dStage_dt_c* stageDt, int roomNo) {
dStage_dt_c_decode(i_data, stageDt, l_layerFuncTableA, ARRAY_SIZE(l_layerFuncTableA));
dStage_Elst_c* elst = i_dComIfGp_getStage()->getElst();
- if (elst != NULL && newRoomNo >= 0 && elst->field_0x0 > newRoomNo) {
- dStage_Elst_c::unkData* d = elst->field_0x4;
+ if (elst != NULL && newRoomNo >= 0 && elst->m_entryNum > newRoomNo) {
+ dStage_Elst_data* d = elst->m_entries;
int layer = dComIfG_play_c::getLayerNo(0);
dStage_setLayerTagName(l_envLayerFuncTable, ARRAY_SIZE(l_envLayerFuncTable),
- d[newRoomNo].field_0x0[layer]);
+ d[newRoomNo].m_layerTable[layer]);
dStage_dt_c_decode(i_data, stageDt, l_envLayerFuncTable, ARRAY_SIZE(l_envLayerFuncTable));
} else {
dStage_setLayerTagName(l_envLayerFuncTable, ARRAY_SIZE(l_envLayerFuncTable), 0);
diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp
index 2b746b171f..34d65459aa 100644
--- a/src/d/kankyo/d_kankyo.cpp
+++ b/src/d/kankyo/d_kankyo.cpp
@@ -1594,7 +1594,7 @@ static void envcolor_init() {
g_env_light.mpSchedule = dKyd_schejule_getp();
}
- g_env_light.mNowRoom = dComIfGp_roomControl_getStayNo();
+ g_env_light.mEnvrIdxPrev = dComIfGp_roomControl_getStayNo();
g_env_light.mEnvrIdxCurr = dComIfGp_roomControl_getStayNo();
g_env_light.mColPatBlend = 1.0f;
g_env_light.field_0x12b0 = 0;
@@ -1729,7 +1729,7 @@ void dKy_clear_game_init() {
g_env_light.mDarkDaytime = 120.0f;
g_env_light.mDarktimeWeek = 0;
- g_env_light.field_0x12fe = 0;
+ g_env_light.mPondSeason = 0;
g_env_light.field_0x130a = 0;
g_env_light.field_0x12cc = 0;
g_env_light.field_0x130c = 0;
@@ -3668,7 +3668,7 @@ void dScnKy_env_light_c::drawKankyo() {
setSunpos();
SetBaseLight();
setLight();
- dKy_setLight_nowroom(g_env_light.mNowRoom);
+ dKy_setLight_nowroom(g_env_light.mEnvrIdxPrev);
}
/* ############################################################################################## */
@@ -4936,7 +4936,7 @@ u8 dKy_pol_sound_get(cBgS_PolyInfo const* p_poly) {
}
int att0 = dComIfG_Bgsp().GetPolyAtt0(*p_poly);
- if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") && g_env_light.field_0x12fe == 4 &&
+ if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") && g_env_light.mPondSeason == 4 &&
att0 == 4)
{
att0 = 13;
@@ -4966,7 +4966,7 @@ u8 dKy_pol_argument_get(cBgS_PolyInfo const* p_poly) {
}
int att0 = dComIfG_Bgsp().GetPolyAtt0(*p_poly);
- if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") && g_env_light.field_0x12fe == 4 &&
+ if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") && g_env_light.mPondSeason == 4 &&
att0 == 4)
{
att0 = 13;
@@ -4999,7 +4999,7 @@ asm u8 dKy_pol_eff_prim_get(cBgS_PolyInfo const* param_0, _GXColor* param_1) {
}
int att0 = dComIfG_Bgsp().GetPolyAtt0(*p_poly);
- if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") && g_env_light.field_0x12fe == 4 && att0 ==
+ if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") && g_env_light.mPondSeason == 4 && att0 ==
4) { att0 = 13; } else if (!strcmp(dComIfGp_getStartStageName(), "D_MN05A") &&
dComIfGs_isStageBossEnemy() && att0 == 11) { att0 = 7;
}
diff --git a/src/d/kankyo/d_kankyo_data.cpp b/src/d/kankyo/d_kankyo_data.cpp
index 9d3c0cc3dc..d7a158d564 100644
--- a/src/d/kankyo/d_kankyo_data.cpp
+++ b/src/d/kankyo/d_kankyo_data.cpp
@@ -248,307 +248,451 @@ static dKyd_lightSchejule l_time_attribute_boss[11] = {
static stage_palette_info_class l_field_data[16] = {
{
{0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- 0x40,
- 0x40,
- 0x40,
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {0x40, 0x40,0x40},
-5000.0f,
30000.0f,
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
},
{
{0x40, 0x40, 0x40},
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
{0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- 0x40,
- 0x40,
- 0x40,
-5000.0f,
30000.0f,
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
},
{
{0x40, 0x40, 0x40},
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
{0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- 0x40,
- 0x40,
- 0x40,
-5000.0f,
30000.0f,
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
},
{
{0x40, 0x40, 0x40},
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
{0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- 0x40,
- 0x40,
- 0x40,
-5000.0f,
30000.0f,
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
},
{
{0x40, 0x40, 0x40},
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
{0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- 0x40,
- 0x40,
- 0x40,
-5000.0f,
30000.0f,
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
},
{
{0x40, 0x40, 0x40},
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
{0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- 0x40,
- 0x40,
- 0x40,
-5000.0f,
30000.0f,
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
},
{
{0x40, 0x40, 0x40},
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
{0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- 0x40,
- 0x40,
- 0x40,
-5000.0f,
30000.0f,
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
},
{
{0x40, 0x40, 0x40},
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
{0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- 0x40,
- 0x40,
- 0x40,
-5000.0f,
30000.0f,
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
},
{
{0x40, 0x40, 0x40},
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
{0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- 0x40,
- 0x40,
- 0x40,
-5000.0f,
30000.0f,
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
},
{
{0x40, 0x40, 0x40},
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
{0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- 0x40,
- 0x40,
- 0x40,
-5000.0f,
30000.0f,
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
},
{
{0x40, 0x40, 0x40},
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
{0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- 0x40,
- 0x40,
- 0x40,
-5000.0f,
30000.0f,
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
},
{
{0x40, 0x40, 0x40},
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
{0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- 0x40,
- 0x40,
- 0x40,
-5000.0f,
30000.0f,
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
},
{
{0x40, 0x40, 0x40},
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
{0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- 0x40,
- 0x40,
- 0x40,
-5000.0f,
30000.0f,
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
},
{
{0x40, 0x40, 0x40},
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
{0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- 0x40,
- 0x40,
- 0x40,
-5000.0f,
30000.0f,
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
},
{
{0x40, 0x40, 0x40},
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
{0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- 0x40,
- 0x40,
- 0x40,
-5000.0f,
30000.0f,
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
},
{
{0x40, 0x40, 0x40},
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
+ {
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ {0x40, 0x40, 0x40},
+ },
{0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- {0x40, 0x40, 0x40},
- 0x40,
- 0x40,
- 0x40,
-5000.0f,
30000.0f,
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
},
};
diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/kankyo/d_kankyo_wether.cpp
index 63e8fb14de..5e5ebacde9 100644
--- a/src/d/kankyo/d_kankyo_wether.cpp
+++ b/src/d/kankyo/d_kankyo_wether.cpp
@@ -828,8 +828,8 @@ static void wether_move_sun() {
g_env_light.mpSunPacket->field_0x28 = 0;
g_env_light.mpSunPacket->field_0x29 = 0;
f32 tmp0 = FLOAT_LABEL(lit_4378);
- g_env_light.mpSunPacket->field_0x5c = tmp0;
- g_env_light.mpSunPacket->field_0x60 = tmp0;
+ g_env_light.mpSunPacket->mVisibility = tmp0;
+ g_env_light.mpSunPacket->mSunAlpha = tmp0;
g_env_light.mpSunPacket->field_0x64 = tmp0;
g_env_light.mpSunPacket->field_0x68 = tmp0;
@@ -854,7 +854,7 @@ static void wether_move_sun() {
g_env_light.mpSunLenzPacket->field_0x8c = lit_4611;
f32 tmp0_2 = FLOAT_LABEL(lit_4378);
g_env_light.mpSunLenzPacket->field_0x90 = tmp0_2;
- g_env_light.mpSunLenzPacket->field_0x98 = tmp0_2;
+ g_env_light.mpSunLenzPacket->mDistFalloff = tmp0_2;
g_env_light.mpSunLenzPacket->mDrawLenzInSky = false;
dKyr_sun_move();
dKyr_lenzflare_move();
@@ -1149,7 +1149,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.field_0x12fe == 3) {
+ if (g_env_light.mPondSeason == 3) {
g_env_light.mpHousiPacket->mpResTex =
(u8*)dComIfG_getStageRes("momiji64s3tc.bti");
} else {
@@ -1528,8 +1528,8 @@ void dKyw_wether_proc() {
// Stage is Fishing Pond
if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") &&
- (g_env_light.field_0x12fe == 1 || g_env_light.field_0x12fe == 3)) {
- if (g_env_light.field_0x12fe == 1) {
+ (g_env_light.mPondSeason == 1 || g_env_light.mPondSeason == 3)) {
+ if (g_env_light.mPondSeason == 1) {
g_env_light.mHousiCount = 35;
} else {
g_env_light.mHousiCount = 30;
diff --git a/src/d/s/d_s_play.cpp b/src/d/s/d_s_play.cpp
index 0e6f131a73..466a081c7f 100644
--- a/src/d/s/d_s_play.cpp
+++ b/src/d/s/d_s_play.cpp
@@ -588,10 +588,10 @@ void dScnPly_c::offReset() {
/* 80259C70-80259CAC 2545B0 003C+00 1/0 0/0 0/0 .text phase_00__FP9dScnPly_c */
static int phase_00(dScnPly_c* scn) {
if (!scn->resetGame()) {
- return cPhs_ZERO_e;
+ return cPhs_INIT_e;
} else {
mDoGph_gInf_c::offBlure();
- return cPhs_TWO_e;
+ return cPhs_NEXT_e;
}
}
@@ -614,15 +614,15 @@ static int phase_01(dScnPly_c* scn) {
mDoAud_setSceneName(dComIfGp_getStartStageName(), start_room, layer);
if (!mDoAud_load1stDynamicWave()) {
- return cPhs_ZERO_e;
+ return cPhs_INIT_e;
} else {
- return cPhs_TWO_e;
+ return cPhs_NEXT_e;
}
}
/* 80259D7C-80259D84 2546BC 0008+00 1/0 0/0 0/0 .text phase_0__FP9dScnPly_c */
static int phase_0(dScnPly_c* param_0) {
- return cPhs_TWO_e;
+ return cPhs_NEXT_e;
}
/* 80259D84-8025A438 2546C4 06B4+00 1/0 0/0 0/0 .text phase_1__FP9dScnPly_c */
@@ -741,10 +741,10 @@ static int phase_1(dScnPly_c* scn) {
// Stage: Fishing Pond, Room: Fishing Pond
if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") && dComIfGp_getStartStageRoomNo() == 0 &&
dComIfGp_getStartStagePoint() == 2) {
- g_env_light.field_0x12fe++;
+ g_env_light.mPondSeason++;
- if (g_env_light.field_0x12fe > 4) {
- g_env_light.field_0x12fe = 1;
+ if (g_env_light.mPondSeason > 4) {
+ g_env_light.mPondSeason = 1;
}
}
@@ -757,19 +757,19 @@ static int phase_1(dScnPly_c* scn) {
if (dComIfG_syncStageRes("Stg_00") < 0) {
dComIfG_setStageRes("Stg_00", NULL);
}
- return cPhs_TWO_e;
+ return cPhs_NEXT_e;
}
/* 8025A438-8025A4F8 254D78 00C0+00 1/0 0/0 0/0 .text phase_1_0__FP9dScnPly_c */
static int phase_1_0(dScnPly_c* param_0) {
if (dComIfG_syncStageRes("Stg_00")) {
- return cPhs_ZERO_e;
+ return cPhs_INIT_e;
} else {
dStage_infoCreate();
dComIfG_setObjectRes("Event", (u8)0, NULL);
dComIfGp_setCameraParamFileName(0, camparamarc);
dComIfG_setObjectRes("CamParam", (u8)0, NULL);
- return cPhs_TWO_e;
+ return cPhs_NEXT_e;
}
}
@@ -779,7 +779,7 @@ static int phase_1_0(dScnPly_c* param_0) {
static int phase_2(dScnPly_c* scn) {
int tmp = dComIfG_syncAllObjectRes();
if (tmp >= 0 && tmp != 0) {
- return cPhs_ZERO_e;
+ return cPhs_INIT_e;
}
int layer = dComIfG_play_c::getLayerNo(0);
stage_stag_info_class* stag_info = i_dComIfGp_getStage()->getStagInfo();
@@ -791,7 +791,7 @@ static int phase_2(dScnPly_c* scn) {
dComIfGp_particle_readScene(particle_no, &scn->sceneCommand);
dMsgObject_readMessageGroup(&scn->field_0x1d0);
- return cPhs_TWO_e;
+ return cPhs_NEXT_e;
}
#else
#pragma push
@@ -807,11 +807,11 @@ static asm int phase_2(dScnPly_c* param_0) {
/* 8025A5D4-8025A654 254F14 0080+00 1/0 0/0 0/0 .text phase_3__FP9dScnPly_c */
static int phase_3(dScnPly_c* scn) {
if ((scn->sceneCommand != NULL && !scn->sceneCommand->sync()) || mDoAud_check1stDynamicWave()) {
- return cPhs_ZERO_e;
+ return cPhs_INIT_e;
} else if (!scn->field_0x1d0 == NULL && !scn->field_0x1d0->sync()) {
- return cPhs_ZERO_e;
+ return cPhs_INIT_e;
} else {
- return cPhs_TWO_e;
+ return cPhs_NEXT_e;
}
}
@@ -940,7 +940,7 @@ static int phase_4(dScnPly_c* i_this) {
}
resPreLoadTime0 = OSGetTime();
- return cPhs_TWO_e;
+ return cPhs_NEXT_e;
}
#else
#pragma push
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 12:28:38 +0000