From 09fdb3ece2125ab15b6dd5c400a75fbd38aae39f Mon Sep 17 00:00:00 2001
From: YunataSavior <58997725+YunataSavior@users.noreply.github.com>
Date: Sat, 7 Jun 2025 01:20:54 -0700
Subject: d_a_npc_maro equivalent (#2439)

* Initial d_a_npc_maro work

* d_a_npc_maro 17% matching

* d_a_npc_maro 28% done

* d_a_npc_maro 38% done

* d_a_npc_maro 57% done

* daNpc_Maro_c::cutArrowTutorial done....

* d_a_npc_maro: dcomifgp_getattention returns ptr now....

* d_a_npc_maro 98% matching

* d_a_npc_maro equivalent

* address d_a_npc_maro PR comments
---
 src/d/d_shop_camera.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/d/d_shop_camera.cpp')

diff --git a/src/d/d_shop_camera.cpp b/src/d/d_shop_camera.cpp
index abc0e7bea5..fef905b6ac 100644
--- a/src/d/d_shop_camera.cpp
+++ b/src/d/d_shop_camera.cpp
@@ -51,10 +51,10 @@ int ShopCam_action_c::shop_cam_action_init() {
     player->onPlayerNoDraw();
 
     setCamAction(&ShopCam_action_c::shop_cam_action);
-    if (field_0xd6 >= 0) {
-        field_0x7c = shop_cam_data_tbl[field_0xd6]->field_0x0;
-        field_0x88 = shop_cam_data_tbl[field_0xd6]->field_0xc;
-        field_0x94 = shop_cam_data_tbl[field_0xd6]->field_0x18;
+    if (mCamDataIdx >= 0) {
+        field_0x7c = shop_cam_data_tbl[mCamDataIdx]->field_0x0;
+        field_0x88 = shop_cam_data_tbl[mCamDataIdx]->field_0xc;
+        field_0x94 = shop_cam_data_tbl[mCamDataIdx]->field_0x18;
     } else if (field_0xd4 <= 0) {
         field_0x7c = field_0x38;
         field_0x88 = field_0x44;
@@ -79,19 +79,19 @@ int ShopCam_action_c::shop_cam_action() {
     cXyz acStack_58;
     f32 dVar11;
     if (field_0xd4 <= 0) {
-        if (field_0xd6 >= 0) {
-            acStack_4c = shop_cam_data_tbl[field_0xd6]->field_0x0;
-            acStack_58 = shop_cam_data_tbl[field_0xd6]->field_0xc;
-            dVar11 = shop_cam_data_tbl[field_0xd6]->field_0x18;
+        if (mCamDataIdx >= 0) {
+            acStack_4c = shop_cam_data_tbl[mCamDataIdx]->field_0x0;
+            acStack_58 = shop_cam_data_tbl[mCamDataIdx]->field_0xc;
+            dVar11 = shop_cam_data_tbl[mCamDataIdx]->field_0x18;
         } else {
             acStack_4c = field_0x38;
             acStack_58 = field_0x44;
             dVar11 = field_0x50;
         }
-    } else if (field_0xd6 >= 0) {
-        acStack_4c = shop_cam_data_tbl[field_0xd6]->field_0x1c;
-        acStack_58 = shop_cam_data_tbl[field_0xd6]->field_0x28;
-        dVar11 = shop_cam_data_tbl[field_0xd6]->field_0x34;
+    } else if (mCamDataIdx >= 0) {
+        acStack_4c = shop_cam_data_tbl[mCamDataIdx]->field_0x1c;
+        acStack_58 = shop_cam_data_tbl[mCamDataIdx]->field_0x28;
+        dVar11 = shop_cam_data_tbl[mCamDataIdx]->field_0x34;
     } else {
         acStack_4c = field_0x54;
         acStack_58 = field_0x60;
@@ -184,7 +184,7 @@ void ShopCam_action_c::move() {
  */
 void ShopCam_action_c::setCamDataIdx(fopAc_ac_c* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3,
                                      fopAc_ac_c* param_4, cXyz* param_5, cXyz* param_6) {
-    field_0xd6 = -1;
+    mCamDataIdx = -1;
     if (field_0x18 == NULL) {
         field_0xb0 = param_1->eyePos;
     }
@@ -219,7 +219,7 @@ void ShopCam_action_c::setCamDataIdx(fopAc_ac_c* param_1, fopAc_ac_c* param_2, f
 void ShopCam_action_c::setCamDataIdx2(fopAc_ac_c* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3,
                                       fopAc_ac_c* param_4, fopAc_ac_c* param_5, fopAc_ac_c* param_6,
                                       fopAc_ac_c* param_7, cXyz* param_8, cXyz* param_9) {
-    field_0xd6 = -1;
+    mCamDataIdx = -1;
     if (field_0x18 == NULL) {
         field_0xb0 = param_1->eyePos;
     }
@@ -304,4 +304,4 @@ void ShopCam_action_c::setMasterCamCtrPos(cXyz* param_0) {
     field_0x38.x = field_0xb0.x;
     field_0x38.y = field_0xb0.y;
     field_0x38.z = field_0xb0.z;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3