mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-25 01:52:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Kytag00 / Vrbox2 work, some cphase / kankyo doc (#1886)

Browse Source 
* kytag00 work

* d_a_vrbox2 close to done

* rename cPhase enum values

* some enums from noclip / kankyo doc

* remove asm

* use macro

* uncomment ok-check.yml
This commit is contained in:
TakaRikka
2023-08-16 13:32:40 -07:00
committed by GitHub
parent 7fd7d0c1f3
commit 114582643f
42 changed files with 1534 additions and 968 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/kankyo/d_kankyo_wether.cpp
+6 -6
View File
@@ -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;