work on d_camera / d_ev_camera (#2170)

src/d/a/d_a_alink_hang.inc

@@ -981,14 +981,39 @@ asm void daAlink_c::checkClimbRoof(f32 param_0) {
 #pragma pop
 
 /* 800FED50-800FEEC0 0F9690 0170+00 2/2 0/0 0/0 .text checkClimbGround__9daAlink_cFP4cXyzf */
+// matches with literals
+#ifdef NONMATCHING
+int daAlink_c::checkClimbGround(cXyz* param_0, f32 param_1) {
+    f32 var_f30 = cM_ssin(shape_angle.y);
+    f32 var_f29 = cM_scos(shape_angle.y);
+
+    param_0->set(current.pos.x + (var_f30 * 4.5f), param_1 + 50.0f, current.pos.z + (var_f29 * 4.5f));
+
+    for (int i = 0; i < 3; i++) {
+        mLinkGndChk.SetPos(param_0);
+
+        f32 cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
+        if (cross != -1000000000.0f && dBgS_CheckBGroundPoly(mLinkGndChk) && cross >= param_1 - 50.0f) {
+            param_0->y = cross;
+            return 1;
+        }
+
+        param_0->x += var_f30 * 1.5f;
+        param_0->z += var_f29 * 1.5f;
+    }
+
+    return 1;
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daAlink_c::checkClimbGround(cXyz* param_0, f32 param_1) {
+asm int daAlink_c::checkClimbGround(cXyz* param_0, f32 param_1) {
     nofralloc
 #include "asm/d/a/d_a_alink/checkClimbGround__9daAlink_cFP4cXyzf.s"
 }
 #pragma pop
+#endif
 
 /* 800FEEC0-800FF28C 0F9800 03CC+00 5/5 0/0 0/0 .text            checkBgClimbMove__9daAlink_cFi */
 #pragma push

src/d/bg/d_bg_s.cpp

@@ -533,7 +533,7 @@ s32 dBgS::GetRoomPathPntNo(cBgS_PolyInfo const& poly) {
 }
 
 /* 80075080-800750D0 06F9C0 0050+00 0/0 2/2 0/0 .text GetGrpSoundId__4dBgSFRC13cBgS_PolyInfo */
-u8 dBgS::GetGrpSoundId(cBgS_PolyInfo const& poly) {
+int dBgS::GetGrpSoundId(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     if (m_chk_element[bg_index].ChkUsed()) {
         return m_chk_element[bg_index].m_bgw_base_ptr->GetGrpSoundId(poly);

src/d/bg/d_bg_w.cpp

@@ -2135,8 +2135,8 @@ u8 dBgW::GetPolyGrpRoomInfId(cBgS_PolyInfo const& poly) {
 }
 
 /* 8007DF58-8007DF88 078898 0030+00 1/0 1/0 0/0 .text GetGrpSoundId__4dBgWFRC13cBgS_PolyInfo */
-u8 dBgW::GetGrpSoundId(cBgS_PolyInfo const& poly) {
-    return GetGrpInf(poly) >> 11;
+int dBgW::GetGrpSoundId(cBgS_PolyInfo const& poly) {
+    return (GetGrpInf(poly) >> 11) & 0xFF;
 }
 
 /* 8007DF88-8007DFC4 0788C8 003C+00 1/0 0/0 0/0 .text

src/d/bg/d_bg_w_kcol.cpp

@@ -864,7 +864,7 @@ u8 dBgWKCol::GetPolyGrpRoomInfId(cBgS_PolyInfo const& poly) {
 
 /* 80082F5C-80082F8C 07D89C 0030+00 1/0 0/0 0/0 .text GetGrpSoundId__8dBgWKColFRC13cBgS_PolyInfo
  */
-u8 dBgWKCol::GetGrpSoundId(cBgS_PolyInfo const& poly) {
+int dBgWKCol::GetGrpSoundId(cBgS_PolyInfo const& poly) {
     u16 poly_index = poly.GetPolyIndex();
 
     dBgPc bgpc;

src/d/d_demo.cpp

@@ -1278,7 +1278,7 @@ JStage::TObject* dDemo_object_c::createCamera() {
 
 /* 80039128-8003913C 033A68 0014+00 0/0 3/3 0/0 .text            getActiveCamera__14dDemo_object_cFv
  */
-JStage::TObject* dDemo_object_c::getActiveCamera() {
+dDemo_camera_c* dDemo_object_c::getActiveCamera() {
     if (mpCamera != NULL) {
         return mpCamera;
     }

src/d/d_stage.cpp

@@ -1891,10 +1891,10 @@ static int dStage_cameraCreate(stage_camera2_data_class* i_cameraData, int i_cam
     i_cameraData = static_cast<stage_camera2_data_class*>(cMl::memalignB(-4, 0x18));
 
     if (i_cameraData != NULL) {
-        i_cameraData->field_0x4 = 0.0f;
-        i_cameraData->field_0x8 = 0.0f;
-        i_cameraData->field_0x4 = 0.0f;
-        i_cameraData->field_0x0 = param_2;
+        i_cameraData->field_0x0.field_0x4.x = 0.0f;
+        i_cameraData->field_0x0.field_0x4.y = 0.0f;
+        i_cameraData->field_0x0.field_0x4.x = 0.0f;
+        i_cameraData->field_0x0.field_0x0 = param_2;
         fopCamM_Create(i_cameraIdx, PROC_CAMERA, i_cameraData);
     }