diff --git a/configure.py b/configure.py index 774d0de5f..363ff3fe0 100755 --- a/configure.py +++ b/configure.py @@ -500,7 +500,7 @@ config.libs = [ Object(Matching, "d/d_cc_s.cpp"), Object(Matching, "d/d_cc_uty.cpp"), Object(NonMatching, "d/d_cam_param.cpp"), - Object(Matching, "d/d_cam_type.cpp"), + Object(MatchingFor("GZLE01", "GZLP01"), "d/d_cam_type.cpp"), Object(Matching, "d/d_cam_style.cpp"), Object(Matching, "d/d_cam_type2.cpp"), Object(NonMatching, "d/d_ev_camera.cpp"), diff --git a/src/d/d_cam_style.cpp b/src/d/d_cam_style.cpp index 68469919e..8c7348377 100644 --- a/src/d/d_cam_style.cpp +++ b/src/d/d_cam_style.cpp @@ -356,6 +356,14 @@ const dCamera__Style dCamParam_c::styles[] = { {0.0f, 0.0f, -99999.992188f, 0.7f, 0.25f, 0.0f, 0.0f, 30.0f, 0.0f, 1.0f, 320.0f, 240.0f, 700.0f, 0.0f, 20.0f, 0.0f, 0.0f, 30.0f, 0.0f, 0.6f, 0.33f, 0.66f, -99999.992188f, 0.0f, 8.0f, 55.0f, 50.0f, 60.0f, 0.0f, 0.4f}, dCamParam_UNK002, }, +#if VERSION == VERSION_JPN + { + 'MM03', + 0xA, + {0.0f, 0.0f, -99999.992188f, 0.7f, 0.25f, 10.0f, 0.0f, 40.0f, 0.0f, 2.0f, 320.0f, 250.0f, 700.0f, 0.0f, 27.0f, 0.0f, -5.0f, 30.0f, 0.0f, 0.6f, 0.33f, 0.5f, -99999.992188f, 0.0f, 8.0f, 55.0f, 50.0f, 62.0f, 0.0f, 0.45f}, + dCamParam_UNK002, + }, +#endif { 'MM02', 0xA, @@ -668,6 +676,14 @@ const dCamera__Style dCamParam_c::styles[] = { {1.0f, 0.0f, -99999.992188f, 0.75f, 0.25f, 15.0f, -99999.992188f, -99999.992188f, -99999.992188f, -99999.992188f, 1050.0f, 950.0f, -99999.992188f, 0.66f, 0.05f, 20.0f, 15.0f, 45.0f, 2.0f, 0.05f, 0.12f, -99999.992188f, -99999.992188f, 1.0f, 0.2f, 60.0f, -99999.992188f, -99999.992188f, -99999.992188f, 0.05f}, dCamParam_UNK001 | dCamParam_UNK400, }, +#if VERSION == VERSION_JPN + { + 'FN38', + 0x1, + {1.0f, 0.0f, -99999.992188f, 0.75f, 0.25f, 40.0f, -99999.992188f, -99999.992188f, -99999.992188f, -99999.992188f, 800.0f, 600.0f, -99999.992188f, 0.66f, 0.15f, 15.0f, -40.0f, 60.0f, 2.0f, 0.05f, 0.3f, 0.05f, -99999.992188f, 0.8f, 0.1f, 62.0f, -99999.992188f, -99999.992188f, -99999.992188f, 0.05f}, + dCamParam_UNK001 | dCamParam_UNK004 | dCamParam_UNK400, + }, +#endif { 'BE08', 0x8, @@ -860,6 +876,7 @@ const dCamera__Style dCamParam_c::styles[] = { {0.0f, 0.0f, -99999.992188f, 0.7f, 0.25f, 30.0f, 25.0f, 30.0f, 0.0f, 0.5f, 250.0f, 160.0f, 420.0f, 0.0f, 20.0f, 20.0f, 40.0f, 5.0f, 0.0f, 2.4f, 0.33f, 0.66f, -99999.992188f, 0.0f, 8.0f, 55.0f, 55.0f, 58.0f, 0.0f, 0.45f}, dCamParam_UNK002, }, +#if VERSION != VERSION_JPN { 'MM03', 0xA, @@ -878,6 +895,7 @@ const dCamera__Style dCamParam_c::styles[] = { {1.0f, 0.0f, -99999.992188f, 0.75f, 0.25f, 30.0f, -99999.992188f, -99999.992188f, -99999.992188f, -99999.992188f, 800.0f, 600.0f, -99999.992188f, 0.66f, 0.15f, 15.0f, -40.0f, 60.0f, 2.0f, 0.05f, 0.3f, 0.05f, -99999.992188f, 0.8f, 0.1f, 62.0f, -99999.992188f, -99999.992188f, -99999.992188f, 0.05f}, dCamParam_UNK001 | dCamParam_UNK004 | dCamParam_UNK400, }, +#endif }; const s32 dCamParam_c::style_num = ARRAY_SIZE(styles); diff --git a/src/d/d_cam_type.cpp b/src/d/d_cam_type.cpp index a9e325619..218bf809d 100644 --- a/src/d/d_cam_type.cpp +++ b/src/d/d_cam_type.cpp @@ -5,6 +5,9 @@ #include "d/d_camera.h" +// Note: Not matching for JPN yet. +// All these array values are different because they're indexes into dCamParam_c::styles, which got shifted around. +// Need to make an enum for these. const dCamera__Type dCamera_c::types[63] = { { "Empty", { { 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF },