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

include/d/a/d_a_itembase.h

@@ -4,7 +4,7 @@
 #include "SSystem/SComponent/c_phase.h"
 #include "d/bg/d_bg_s_acch.h"
 #include "d/cc/d_cc_d.h"
-#include "f_op/f_op_actor.h"
+#include "f_op/f_op_actor_mng.h"
 
 struct daItemBase_data {
     /* 0x00 */ f32 mGravity;
@@ -71,7 +71,7 @@ public:
     /* 0x764 */ dBgS_AcchCir mAcchCir;
     /* 0x7A4 */ dCcD_Stts mColStatus;
     /* 0x7E0 */ dCcD_Cyl mCollider;
-    /* 0x91C */ u32 field_0x91c;
+    /* 0x91C */ u32 mShadowKey;
     /* 0x920 */ u32 field_0x920;
     /* 0x924 */ int field_0x924;
     /* 0x928 */ s16 field_0x928;

include/d/a/d_a_npc.h

@@ -867,7 +867,13 @@ private:
 
 public:
     /* 80150870 */ void initialize(dPath*, int);
-};
+
+    daNpcF_SPCurve_c() {
+        initialize(NULL, 0);
+    }
+
+    virtual ~daNpcF_SPCurve_c() {}
+};  // Size: 0x60C
 
 class daNpcF_Path_c {
 private:
@@ -888,17 +894,23 @@ public:
     /* 80150A7C */ void chkPassedDst(cXyz);
     /* 80150BBC */ void reverse();
     /* 80150BE0 */ int setNextIdx();
-    /* 80150C18 */ u16 getNextIdx();
+    /* 80150C18 */ int getNextIdx();
     /* 80150C60 */ u16 getBeforeIdx();
     /* 80150CA8 */ int getBeforePos(cXyz&);
     /* 80150D44 */ int getNextPos(cXyz&);
     /* 80150DE0 */ int getDstPos(cXyz, cXyz&);
     /* 80150EB4 */ void setNextIdxDst(cXyz);
 
-    u16& getIdx() { return mIdx; };
-    inline Vec getPntPos(int i_idx) { return mpRoomPath->m_points[i_idx].m_position; }
+    daNpcF_Path_c() {
+        initialize();
+    }
+
+    virtual ~daNpcF_Path_c() {}
+
+    int getIdx() { return mIdx; };
+    Vec getPntPos(int i_idx) { return mpRoomPath->m_points[i_idx].m_position; }
     int chkClose() { return dPath_ChkClose(mpRoomPath); }
-};
+};  // Size: 0x630
 
 class daNpcF_Lookat_c {
 private:

include/d/a/d_a_shop_item_static.h

@@ -12,6 +12,18 @@ struct ResourceData {
     s16 get_bxa1Name() const { return mBxaName; }
     s16 get_brk1Name() const { return mBrkName; }
     s16 get_btp1Name() const { return mBtpName; }
+    f32 get_scale() const { return mScale; }
+    f32 get_offsetY() const { return mOffsetY; }
+    s16 get_angleX() const { return mAngle.x; }
+    s16 get_angleY() const { return mAngle.y; }
+    s16 get_angleZ() const { return mAngle.z; }
+    s16 get_angleOffsetX() const { return mAngleOffsetX; }
+    u32 get_flag() const { return mFlag; }
+    s8 get_tevfrm() const { return mTevFrm; }
+    s8 get_btpfrm() const { return mBtpFrm; }
+    u8 get_shadowSize() const { return mShadowSize; }
+    u8 get_collisionH() const { return mCollisionH; }
+    u8 get_collisionR() const { return mCollisionR; }
 
     /* 0x00 */ const char* mArcName;
     /* 0x04 */ s16 mBmdName;
@@ -37,6 +49,24 @@ class daShopItem_c : public daItemBase_c {
 public:
     /* 80037C14 */ csXyz* getRotateP();
     /* 80037C1C */ cXyz* getPosP();
+    /* 8059E9B8 */ const char* getShopArcname();
+    /* 8059EC04 */ u16 getHeapSize();
+    /* 8059EC1C */ void CreateInit();
+    /* 8059ED58 */ void set_mtx();
+    /* 8059EEF4 */ bool _execute();
+    /* 8059EF48 */ bool _draw();
+
+    inline int _create();
+    inline int _delete();
+    
+    /* 8059EF9C */ virtual void setListStart();
+    /* 8059EFA0 */ virtual void setShadow();
+    /* 8059F024 */ virtual BOOL chkFlag(int);
+    /* 8059F044 */ virtual s8 getTevFrm();
+    /* 8059F064 */ virtual s8 getBtpFrm();
+    /* 8059F084 */ virtual u8 getShadowSize();
+    /* 8059F0A0 */ virtual u8 getCollisionH();
+    /* 8059F0BC */ virtual u8 getCollisionR();
 
     u8 getShopItemID() const { return mShopItemID; }
     s16 getAngleX() const { return mAngleX; }
@@ -45,6 +75,34 @@ public:
     void setAngleY(s16 angle) { mAngleY = angle;}
 
     static ResourceData const mData[23];
+    static f32 const m_cullfar_max;
+
+    enum {
+        SHOP_ITEMNO_SOLD,
+        SHOP_ITEMNO_OIL,
+        SHOP_ITEMNO_RED,
+        SHOP_ITEMNO_MILK,
+        SHOP_ITEMNO_HALF_MILK,
+        SHOP_ITEMNO_ARROW,
+        SHOP_ITEMNO_SHIELD_B,
+        SHOP_ITEMNO_SHIELD_A,
+        SHOP_ITEMNO_BOMB,
+        SHOP_ITEMNO_WATER_BOMB,
+        SHOP_ITEMNO_POKE_BOMB,
+        SHOP_ITEMNO_BOMB_BAG,
+        SHOP_ITEMNO_BOMB_BAG_LV2,
+        SHOP_ITEMNO_LAND_MINE,
+        SHOP_ITEMNO_BOTTLE2,
+        SHOP_ITEMNO_BEE_CHILD,
+        SHOP_ITEMNO_PACHINKO,
+        SHOP_ITEMNO_BLUE,
+        SHOP_ITEMNO_HAWKEYE,
+        SHOP_ITEMNO_ARMOR,
+        SHOP_ITEMNO_ARMOR_SOLD,
+        SHOP_ITEMNO_GREEN,
+        SHOP_ITEMNO_DROP,
+        SHOP_ITEMNO_MAX,
+    };
 
 private:
     /* 0x92C */ Mtx mMtx;
@@ -54,4 +112,6 @@ private:
     /* 0x964 */ u8 mShopItemID;
 };
 
+int CheckShopItemCreateHeap(fopAc_ac_c* i_this);
+
 #endif /* D_A_D_A_SHOP_ITEM_STATIC_H */

include/d/com/d_com_inf_game.h

@@ -823,6 +823,7 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* resName
 int dComIfG_TimerDeleteRequest(int i_mode);
 int dComIfG_TimerStart(int i_mode, s16 i_time);
 bool dComIfGp_isLightDropMapVisible();
+int dComIfG_TimerEnd(int i_mode, int param_1);
 
 inline void dComIfG_setBrightness(u8 brightness) {
     g_dComIfG_gameInfo.mFadeBrightness = brightness;

include/d/d_stage.h

@@ -292,7 +292,7 @@ struct dStage_dPnt_c {
     /* 0x1 */ u8 field_0x1;
     /* 0x2 */ u8 field_0x2;
     /* 0x3 */ u8 field_0x3;
-    /* 0x4 */ cXyz m_position;
+    /* 0x4 */ Vec m_position;
 };  // Size: 0x10
 
 struct dStage_FloorInfo_c {

include/d/d_timer.h

@@ -10,9 +10,11 @@ class JKRArchive;
 class JKRExpHeap;
 
 s32 dTimer_createStockTimer();
-s32 dTimer_createTimer(s32 param_0, u32 param_1, u8 param_2, u8 param_3, f32 param_4, f32 param_5,
+s32 dTimer_createTimer(s32 i_mode, u32 i_limitMs, u8 i_type, u8 param_3, f32 param_4, f32 param_5,
                        f32 param_6, f32 param_7);
 int dTimer_getRestTimeMs();
+u8 dTimer_isStart();
+u8 dTimer_isReadyFlag();
 
 class dDlst_TimerScrnDraw_c : public dDlst_base_c {
 public:
@@ -125,7 +127,7 @@ public:
     /* 8025D9F0 */ int getTimeMs();
     /* 8025DA54 */ int getLimitTimeMs();
     /* 8025DA9C */ int getRestTimeMs();
-    /* 8025DB10 */ int isStart();
+    /* 8025DB10 */ u8 isStart();
     /* 802613DC */ int createGetIn(cXyz);
 
     s32 createStart(u16 param_0) { return mp_tm_scrn->createStart(param_0); }