d_a_shop_item, d_a_b_go, d_a_b_gos OK (#2085)

* d_a_shop_item OK

* d_a_b_go OK

* d_a_b_gos OK

* remove asm

* some work on d_a_b_oh / d_a_b_zant_sima

* d_a_startAndGoal done

4 files changed, 17 insertions, 16 deletions

diff --git a/src/d/a/d_a_itembase.cpp b/src/d/a/d_a_itembase.cpp
index bf0d8a9eeb..5dda2b8d49 100644
--- a/src/d/a/d_a_itembase.cpp
+++ b/src/d/a/d_a_itembase.cpp
@@ -185,7 +185,7 @@ void daItemBase_c::setShadow() {
             shadowSize = 150.0f;
         }
 
-        field_0x91c = dComIfGd_setShadow(field_0x91c, 3, mpModel, &current.pos, shadowSize, 0.0f,
+        mShadowKey = dComIfGd_setShadow(mShadowKey, 3, mpModel, &current.pos, shadowSize, 0.0f,
                                          current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr,
                                          0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
     }
diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp
index fdc9ae6ad5..d1bad39509 100644
--- a/src/d/a/d_a_npc.cpp
+++ b/src/d/a/d_a_npc.cpp
@@ -4217,7 +4217,7 @@ int daNpcF_Path_c::setNextIdx() {
 }
 
 /* 80150C18-80150C60 14B558 0048+00 0/0 0/0 9/9 .text            getNextIdx__13daNpcF_Path_cFv */
-u16 daNpcF_Path_c::getNextIdx() {
+int daNpcF_Path_c::getNextIdx() {
     u16 ret = mIdx;
 
     daNpcF_incIdx(mpRoomPath->m_num, ret, chkClose(), field_0x02);
diff --git a/src/d/a/d_a_shop_item_static.cpp b/src/d/a/d_a_shop_item_static.cpp
index 12fdc6a3bc..699bb3a027 100644
--- a/src/d/a/d_a_shop_item_static.cpp
+++ b/src/d/a/d_a_shop_item_static.cpp
@@ -1,6 +1,6 @@
 /**
  * d_a_shop_item_static.cpp
- * 
+ *
  */
 
 #include "d/a/d_a_shop_item_static.h"
@@ -43,15 +43,16 @@ ResourceData const daShopItem_c::mData[23] = {
 };
 
 /* 80037C24-80037C7C 032564 0058+00 0/0 0/0 1/1 .text CheckShopItemCreateHeap__FP10fopAc_ac_c */
-void CheckShopItemCreateHeap(fopAc_ac_c* actor) {
-    daShopItem_c* item = static_cast<daShopItem_c*>(actor);
+int CheckShopItemCreateHeap(fopAc_ac_c* i_this) {
+    daShopItem_c* a_this = static_cast<daShopItem_c*>(i_this);
 
-    u8 item_id = item->getShopItemID();
-    item->CreateItemHeap(
-        daShopItem_c::mData[item_id].get_arcName(), daShopItem_c::mData[item_id].get_bmdName(),
-        daShopItem_c::mData[item_id].get_btk1Name(), daShopItem_c::mData[item_id].get_bpk1Name(),
-        daShopItem_c::mData[item_id].get_bck1Name(), daShopItem_c::mData[item_id].get_bxa1Name(),
-        daShopItem_c::mData[item_id].get_brk1Name(), daShopItem_c::mData[item_id].get_btp1Name());
+    u8 a_ShopItemID = a_this->getShopItemID();
+    return a_this->CreateItemHeap(daShopItem_c::mData[a_ShopItemID].get_arcName(),
+                                  daShopItem_c::mData[a_ShopItemID].get_bmdName(),
+                                  daShopItem_c::mData[a_ShopItemID].get_btk1Name(),
+                                  daShopItem_c::mData[a_ShopItemID].get_bpk1Name(),
+                                  daShopItem_c::mData[a_ShopItemID].get_bck1Name(),
+                                  daShopItem_c::mData[a_ShopItemID].get_bxa1Name(),
+                                  daShopItem_c::mData[a_ShopItemID].get_brk1Name(),
+                                  daShopItem_c::mData[a_ShopItemID].get_btp1Name());
 }
-
-/* 80379738-80379738 005D98 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp
index 0a0ecf4b44..3e72d130ea 100644
--- a/src/d/d_timer.cpp
+++ b/src/d/d_timer.cpp
@@ -480,7 +480,7 @@ int dTimer_c::getRestTimeMs() {
 }
 
 /* 8025DB10-8025DB38 258450 0028+00 1/1 0/0 4/4 .text            isStart__8dTimer_cFv */
-int dTimer_c::isStart() {
+u8 dTimer_c::isStart() {
     if (field_0x16A != 1 && m_mode == 4) {
         return 1;
     }
@@ -1618,7 +1618,7 @@ static int dTimer_createStart2D(s32 param_0, u16 param_1) {
 }
 
 /* 802611F0-80261244 25BB30 0054+00 0/0 0/0 5/5 .text            dTimer_isStart__Fv */
-int dTimer_isStart() {
+u8 dTimer_isStart() {
     if (dComIfG_getTimerPtr() != NULL) {
         return dComIfG_getTimerPtr()->isStart();
     }
@@ -1650,7 +1650,7 @@ void dTimer_hide() {
 }
 
 /* 80261340-80261394 25BC80 0054+00 0/0 0/0 1/1 .text            dTimer_isReadyFlag__Fv */
-u32 dTimer_isReadyFlag() {
+u8 dTimer_isReadyFlag() {
     if (dComIfG_getTimerPtr() != NULL) {
         return dComIfG_getTimerPtr()->isReadyFlag();
     }