mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-28 23:27:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some henna documentation (#2739)

Browse Source 
* henna minor cleanup

* rename light to kankyo

* more cleanup

* pos

* more cleanup

* fix build

* final fix
This commit is contained in:
Luzagar
2025-10-18 00:11:34 +02:00
committed by GitHub
parent 86895b23c2
commit 9e3d968435
21 changed files with 380 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/c/c_damagereaction.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ u8 data_80450C9B;
u8 data_80450C9C;
u8 data_80450C9D;
u8 data_80450C9E;
u8 cDmr_FishingWeather;
u8 cDmr_FishingWether;
/* 8001817C-800182A4 012ABC 0128+00 1/0 0/0 0/0 .text
* execute__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle */
src/d/actor/d_a_L7op_demo_dr.cpp
+1 -1
View File
@@ -159,7 +159,7 @@ void daL7ODR_c::pl_walk() {
field_0x898 = 2.0f;
dScnKy_env_light_c* kankyo = dKy_getEnvlight();
kankyo->field_0x12cc = 1;
kankyo->wether = 1;
field_0x888++;
}
} else if (field_0x888 == 2) {
src/d/actor/d_a_b_dr.cpp
+4 -4
View File
@@ -3877,7 +3877,7 @@ void daB_DR_c::demo_skip(int) {
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
dStage_changeScene(1, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1);
Z2GetAudioMgr()->subBgmStop();
dKy_getEnvlight()->field_0x12cc = 1;
dKy_getEnvlight()->wether = 1;
cDmr_SkipInfo = 1;
dComIfGs_onZoneSwitch(0, fopAcM_GetRoomNo(this));
@@ -4182,7 +4182,7 @@ int daB_DR_c::create() {
}
dScnKy_env_light_c* kankyo = dKy_getEnvlight();
kankyo->field_0x12cc = 0;
kankyo->wether = 0;
return cPhs_ERROR_e;
}
@@ -4307,7 +4307,7 @@ int daB_DR_c::create() {
setActionMode(ACTION_FLY_WAIT, 0);
dScnKy_env_light_c* kankyo = dKy_getEnvlight();
kankyo->field_0x12cc = 2;
kankyo->wether = 2;
}
if (arg0 == 0) {
@@ -4325,7 +4325,7 @@ int daB_DR_c::create() {
}
dScnKy_env_light_c* kankyo = dKy_getEnvlight();
kankyo->field_0x12cc = 0;
kankyo->wether = 0;
}
if (cDmr_SkipInfo != 0 || dComIfGs_isZoneSwitch(0, fopAcM_GetRoomNo(this)) ) {
src/d/actor/d_a_b_dre.cpp
+2 -2
View File
@@ -262,7 +262,7 @@ void daB_DRE_c::CamAction2() {
if (mTimers[0] == 0) {
SetAnm(mpModelMorf, 0x38, 0, 5.0f, 1.0f);
dScnKy_env_light_c* kankyo = dKy_getEnvlight();
kankyo->field_0x12cc = 2;
kankyo->wether = 2;
mDrMode++;
mCameraMode++;
}
@@ -580,7 +580,7 @@ void daB_DRE_c::DrAction() {
mAnm = 0x1F;
dScnKy_env_light_c* kankyo = dKy_getEnvlight();
kankyo->field_0x12cc = 0;
kankyo->wether = 0;
mHideModel = true;
mDrMode++;
src/d/actor/d_a_b_gnd.cpp
+4 -4
View File
@@ -2561,7 +2561,7 @@ static void action(b_gnd_class* i_this) {
#ifdef DEBUG
if (mDoCPd_c::getTrigR(PAD_2)) {
dScnKy_env_light_c* kankyo = dKy_getEnvlight();
kankyo->field_0x12cc = 1;
kankyo->wether = 1;
i_this->mActionMode = ACTION_WAIT;
i_this->mMoveMode = 0;
@@ -3272,7 +3272,7 @@ static void demo_camera(b_gnd_class* i_this) {
anm_init(i_this, B_GND_BCK_EGND_KAMAE, 3.0f, 0, 1.0f);
i_this->mGndEyeBtkNo = 5;
Z2GetAudioMgr()->bgmStart(Z2BGM_VS_GANON_04, 0, 0);
kankyo->field_0x12cc = 3;
kankyo->wether = 3;
}
if (i_this->mDemoCamTimer == 320) {
@@ -3294,7 +3294,7 @@ static void demo_camera(b_gnd_class* i_this) {
dComIfGs_onOneZoneSwitch(15, -1);
dComIfGs_onSaveDunSwitch(1);
Z2GetAudioMgr()->setDemoName("force_end");
kankyo->field_0x12cc = 1;
kankyo->wether = 1;
}
break;
case 50:
@@ -3930,7 +3930,7 @@ static int daB_GND_Execute(b_gnd_class* i_this) {
i_this->mNoDrawTimer--;
if (i_this->mNoDrawTimer == 0) {
dScnKy_env_light_c* kankyo = dKy_getEnvlight();
kankyo->field_0x12cc = 1;
kankyo->wether = 1;
i_this->mActionMode = ACTION_WAIT;
i_this->mMoveMode = 0;
src/d/actor/d_a_kytag06.cpp
+4 -4
View File
@@ -521,7 +521,7 @@ static void daKytag06_wether_proc(kytag06_class* i_this, u8 param_1) {
* daKytag06_type_07_wether_Execute__FP13kytag06_class */
static void daKytag06_type_07_wether_Execute(kytag06_class* i_this) {
dScnKy_env_light_c* env_light = dKy_getEnvlight();
daKytag06_wether_proc(i_this, env_light->field_0x12cc);
daKytag06_wether_proc(i_this, env_light->wether);
}
/* 808586F0-808589A4 000F70 02B4+00 1/1 0/0 0/0 .text daKytag06_type_07_Execute__FP13kytag06_class
@@ -617,7 +617,7 @@ static void daKytag06_type_06_Execute(kytag06_class* i_this) {
dComIfGs_getTime();
dScnKy_env_light_c* env_light = dKy_getEnvlight();
daKytag06_wether_proc(i_this, env_light->field_0x12cc);
daKytag06_wether_proc(i_this, env_light->wether);
cXyz spX;
f32 current_time = dComIfGs_getTime();
@@ -682,13 +682,13 @@ static void daKytag06_type_06_Execute(kytag06_class* i_this) {
*/
static void daKytag06_type_08_Execute(kytag06_class* i_this) {
dScnKy_env_light_c* env_light = dKy_getEnvlight();
daKytag06_lv7_boss_wether_proc(i_this, env_light->field_0x12cc);
daKytag06_lv7_boss_wether_proc(i_this, env_light->wether);
}
/* 80858D00-80858D2C 001580 002C+00 1/1 0/0 0/0 .text daKytag06_type_09_Execute__FP13kytag06_class */
static void daKytag06_type_09_Execute(kytag06_class* i_this) {
dScnKy_env_light_c* env_light = dKy_getEnvlight();
daKytag06_Ganon_wether_proc(i_this, env_light->field_0x12cc);
daKytag06_Ganon_wether_proc(i_this, env_light->wether);
}
/* 80858D2C-8085912C 0015AC 0400+00 1/1 0/0 0/0 .text daKytag06_type_10_Execute__FP13kytag06_class */
src/d/actor/d_a_mg_fshop.cpp
+3 -3
View File
@@ -1755,7 +1755,7 @@ static int daFshop_Execute(fshop_class* param_1) {
henna->actor.health = 2;
}
henna->field_0x752 = 0x49;
henna->cam_mode = 0x49;
henna->field_0x754 = 0;
henna->field_0x7b9 = 0;
param_1->field_0x567 = 2;
@@ -1775,9 +1775,9 @@ static int daFshop_Execute(fshop_class* param_1) {
if (bVar5) {
henna->actor.health = 3;
henna->field_0x752 = 0x49;
henna->cam_mode = 0x49;
} else {
henna->field_0x752 = 0x4c;
henna->cam_mode = 0x4c;
}
henna->field_0x754 = 0;
henna->field_0x7b9 = 0;
src/d/actor/d_a_mg_rod.cpp
+5 -5
View File
@@ -2612,7 +2612,7 @@ static void lure_catch(dmg_rod_class* i_this) {
}
if (henna != NULL && sp8 == 2) {
henna->field_0x6a4 = 10;
henna->move_mode = 10;
}
daAlink_getAlinkActorClass()->changeFishGetFace(sp8);
@@ -2849,7 +2849,7 @@ static void lure_heart(dmg_rod_class* i_this) {
dComIfGp_setMesgBgmOn();
if (henna != NULL) {
henna->field_0x6a4 = 10;
henna->move_mode = 10;
henna->field_0x688 = 1;
}
}
@@ -3541,7 +3541,7 @@ static void uki_ready(dmg_rod_class* i_this) {
cLib_addCalc2(&i_this->field_0xf64, -30.0f + ZREG_F(1), 1.0f, 0.5f + BREG_F(14));
cLib_addCalc2(&i_this->field_0xf68, -(20.0f + AREG_F(10)), 1.0f, 0.02f * (20.0f + AREG_F(10)));
if (i_this->timers[0] != 0 || dComIfGp_event_runCheck() != 0 || i_this->play_cam_mode >= 1000 || (henna != NULL && henna->field_0x752 != 0) || dComIfGp_checkPlayerStatus0(0, 0x100000)) {
if (i_this->timers[0] != 0 || dComIfGp_event_runCheck() != 0 || i_this->play_cam_mode >= 1000 || (henna != NULL && henna->cam_mode != 0) || dComIfGp_checkPlayerStatus0(0, 0x100000)) {
return;
}
@@ -4015,7 +4015,7 @@ static void uki_catch(dmg_rod_class* i_this) {
}
if (henna != NULL) {
henna->field_0x6a4 = 30;
henna->move_mode = 30;
}
} else if (mgfish->mCaughtType == MG_CATCH_SP) {
i_this->msgflow.init(actor, 0x1397, 0, NULL);
@@ -5658,7 +5658,7 @@ static void play_camera_u(dmg_rod_class* i_this) {
camera->mCamera.SetTrimSize(0);
if (dMsgObject_getSelectCursorPos() != 0) {
henna->field_0x752 = 300;
henna->cam_mode = 300;
}
}
break;
src/d/actor/d_a_npc_henna.cpp
+330 -331
View File
File diff suppressed because it is too large Load Diff
src/d/d_kankyo.cpp
+6 -6
View File
@@ -1248,19 +1248,19 @@ static void envcolor_init() {
if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") ||
!strcmp(dComIfGp_getStartStageName(), "R_SP127"))
{
if (g_env_light.field_0x12cc >= 7) {
if (g_env_light.wether >= 7) {
g_env_light.mColpatWeather = 2;
} else if (g_env_light.field_0x12cc != 0) {
} else if (g_env_light.wether != 0) {
g_env_light.mColpatWeather = 1;
}
} else if (!strcmp(dComIfGp_getStartStageName(), "D_MN07A")) {
if (g_env_light.field_0x12cc == 1) {
if (g_env_light.wether == 1) {
g_env_light.mColpatWeather = 1;
} else if (g_env_light.field_0x12cc == 2) {
} else if (g_env_light.wether == 2) {
g_env_light.mColpatWeather = 2;
}
} else {
g_env_light.field_0x12cc = 0;
g_env_light.wether = 0;
}
g_env_light.base_raincnt = 0;
@@ -1359,7 +1359,7 @@ void dKy_clear_game_init() {
g_env_light.darktime_week = 0;
g_env_light.fishing_hole_season = 0;
g_env_light.field_0x130a = 0;
g_env_light.field_0x12cc = 0;
g_env_light.wether = 0;
g_env_light.staffroll_next_timer = 0;
}
src/d/d_kankyo_rain.cpp
+1 -1
View File
@@ -1610,7 +1610,7 @@ void cloud_shadow_move() {
cLib_addCalc(&g_env_light.field_0xebc, 0.3f, 0.1f, 0.01f, 0.000001f);
}
if (g_env_light.field_0x12cc >= 3) {
if (g_env_light.wether >= 3) {
cLib_addCalc(&g_env_light.field_0xebc, 1.0f, 0.5f, 0.1f, 0.000001f);
}
}
src/d/d_kankyo_wether.cpp
+1 -1
View File
@@ -923,7 +923,7 @@ static void wether_move_vrkumo() {
if (memcmp(dComIfGp_getStartStageName(), "D_MN07", 6) == 0 ||
strcmp(dComIfGp_getStartStageName(), "F_SP114") == 0 ||
(strcmp(dComIfGp_getStartStageName(), "D_MN09B") == 0 &&
(g_env_light.field_0x12cc != 0 || dComIfGp_event_runCheck())))
(g_env_light.wether != 0 || dComIfGp_event_runCheck())))
{
cLib_addCalc(&g_env_light.mVrkumoStrength, 1.0f, 0.1f, 0.003f, 0.0000001f);
} else if (strcmp(dComIfGp_getStartStageName(), "F_SP104") == 0 &&