d_a_obj_swpropeller OK, work on d_kankyo / misc

include/d/com/d_com_inf_game.h

@@ -1789,6 +1789,12 @@ inline u8 dComIfGp_att_getCatchChgItem() {
     return dComIfGp_getAttention().getCatchChgItem();
 }
 
+inline void dComIfGp_att_LookRequest(fopAc_ac_c* param_0, f32 i_horizontalDist, f32 i_upDist,
+                                     f32 i_downDist, s16 i_angle, int param_5) {
+    dComIfGp_getAttention().LookRequest(param_0, i_horizontalDist, i_upDist, i_downDist, i_angle,
+                                        param_5);
+}
+
 inline J2DGrafContext* dComIfGp_getCurrentGrafPort() {
     return g_dComIfG_gameInfo.play.getCurrentGrafPort();
 }

include/d/d_attention.h

@@ -215,10 +215,15 @@ public:
     int GetActionCount() { return mActionCount; }
     int GetLockonCount() { return mLockonCount; }
     bool Lockon() { return LockonTruth() || chkFlag(0x20000000); }  // only matches with -O2?
-    int ZHintRequest(fopAc_ac_c *param_1, int param_2) {
+    int ZHintRequest(fopAc_ac_c* param_1, int param_2) {
         return mZHintTarget.request(param_1, param_2);
     }
 
+    void LookRequest(fopAc_ac_c* param_0, f32 i_horizontalDist, f32 i_upDist, f32 i_downDist,
+                     s16 i_angle, int param_5) {
+        mLookTarget.request(param_0, i_horizontalDist, i_upDist, i_downDist, i_angle, param_5);
+    }
+
     static dist_entry& i_getDistTable(int i_no) { return dist_table[i_no]; }
 
     static type_tbl_entry loc_type_tbl[3];

include/d/d_stage.h

@@ -782,7 +782,7 @@ public:
     /* 80024954 */ static bool resetArchiveBank(int);
     /* 80024DB0 */ static void SetTimePass(int);
     /* 8025BAAC */ static void setZoneNo(int, int);
-    static s32 GetTimePass();
+    static s8 GetTimePass();
 
     static s8 getStayNo() { return mStayNo; }
     static u8 getRegionNo(int i_roomNo) { return mStatus[i_roomNo].mRegionNo; }
@@ -1031,7 +1031,7 @@ inline s32 i_dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0) {
 }
 
 inline s8 dStage_stagInfo_GetTimeH(stage_stag_info_class* p_info) {
-    return p_info->field_0x0c >> 8;
+    return (p_info->field_0x0c >> 8) & 0xFF;
 }
 
 inline BOOL dStage_staginfo_GetArchiveHeap(stage_stag_info_class* p_info) {

include/d/kankyo/d_kankyo.h

@@ -12,6 +12,7 @@
 
 class JPABaseEmitter;
 class cBgS_PolyInfo;
+class color_RGB_class;
 
 void dKankyo_DayProc();
 void dKy_set_nexttime(f32);
@@ -44,6 +45,11 @@ void dKy_setLight();
 cXyz dKy_plight_near_pos();
 void dKy_BossSpotLight_set(cXyz* param_0, f32 param_1, f32 param_2, f32 param_3, _GXColor* param_4,
                            f32 param_5, u8 param_6, u8 param_7);
+static void dKy_calc_color_set(_GXColorS10* param_0, color_RGB_class* param_1,
+                               color_RGB_class* param_2, color_RGB_class* param_3,
+                               color_RGB_class* param_4, f32 param_5, f32 param_6,
+                               _GXColorS10 param_7, f32 param_8);
+static void dKy_twilight_camelight_set();
 
 struct LIGHT_INFLUENCE {
     /* 800CFC7C */ ~LIGHT_INFLUENCE() {}
@@ -203,7 +209,7 @@ public:
     /* 0x367 */ u8 field_0x367;
     /* 0x368 */ f32 mFogStartZ;
     /* 0x36C */ f32 mFogEndZ;
-    /* 0x370 */ f32 field_0x370;
+    /* 0x370 */ f32 mColpatBlend;
     /* 0x374 */ f32 field_0x374;
     /* 0x378 */ u16 field_0x378;
     /* 0x37A */ u8 field_0x37a;
@@ -379,9 +385,7 @@ public:
     /* 0x1058 */ dKankyo_evil_Packet* mpEvilPacket;
     /* 0x105C */ mDoExt_btkAnm* field_0x105c;
     /* 0x1060 */ fopAc_ac_c* field_0x1060;
-    /* 0x1064 */ f32 field_0x1064;
-    /* 0x1068 */ f32 field_0x1068;
-    /* 0x106C */ f32 field_0x106c;
+    /* 0x1064 */ Vec field_0x1064;
     /* 0x1070 */ cXyz mSunPos2;
     /* 0x107C */ cXyz mPLightNearPos;
     /* 0x1088 */ cXyz mSunPos;
@@ -394,10 +398,7 @@ public:
     /* 0x10D8 */ GXColorS10 mUnderCloudShadowColor;
     /* 0x10E0 */ GXColorS10 mCloudOuterHazeColor;
     /* 0x10E8 */ GXColorS10 mCloudInnerHazeColor;
-    /* 0x10F0 */ s16 field_0x10f0;
-    /* 0x10F2 */ s16 field_0x10f2;
-    /* 0x10F4 */ s16 field_0x10f4;
-    /* 0x10F6 */ s16 field_0x10f6;
+    /* 0x10F0 */ GXColorS10 field_0x10f0;
     /* 0x10F8 */ s16 field_0x10f8;
     /* 0x10FA */ s16 field_0x10fa;
     /* 0x10FC */ s16 field_0x10fc;
@@ -493,7 +494,7 @@ public:
     /* 0x12B8 */ u8 field_0x12b8[4];
     /* 0x12BC */ u16 mFogAdjCenter;
     /* 0x12BE */ u16 mDate;
-    /* 0x12C0 */ u16 mActorLightEffect;
+    /* 0x12C0 */ s16 mActorLightEffect;
     /* 0x12C2 */ u8 mColPatPrev;
     /* 0x12C3 */ u8 mColPatCurr;
     /* 0x12C4 */ u8 mColpatPrevGather;

include/d/kankyo/d_kankyo_wether.h

@@ -237,7 +237,6 @@ public:
     virtual void draw();
     virtual ~dKankyo_vrkumo_Packet();
 
-private:
     /* 0x0010 */ GXColor mColor;
     /* 0x0014 */ u8* mpResCloudtx_01;
     /* 0x0018 */ u8* mpResCloudtx_02;