kartCrash

include/Kaneshige/Course/CrsArea.h

@@ -25,6 +25,7 @@ class CrsArea
     void searchShadow(const JGeometry::TVec3f &p1) { search(0, p1); }
     void searchCamera(const JGeometry::TVec3f &p1) { search(1, p1); }
     void searchRoof(const JGeometry::TVec3f &p1) { search(2, p1); }
+    void searchInvValley(const JGeometry::TVec3f &p1) { search(3, p1); }
     void searchLight(const JGeometry::TVec3f &p1) { search(7, p1); }
 
     bool isInside() const { return mArea != nullptr; }

include/Kaneshige/KartChecker.h

@@ -188,6 +188,9 @@ class KartChecker
 
     void setBombEvent(EBombEvent, ItemObj *);
 
+    void setBEHitBomb(ItemObj *itemObj) { setBombEvent(EVENT_1, itemObj); }
+    void setBEJugem() { setBombEvent(EVENT_3, nullptr); }
+
     void beginWarp(JugemPoint *point)
     {
         if (mWarpState == 0)

include/Kaneshige/KartDrawer.h

@@ -100,6 +100,13 @@ class KartDrawer
     void lodOff() { mEnableLOD = false; }
     u8 getGhostAlpha() const { return mGhostAlpha; }
 
+    void flashOff() { mFlashState = 0; }
+    void flashOn() {
+        if (mFlashState != 0) return;
+        mFlashState = 1;
+        mFlashTime = 0;
+    }
+
 private:
     static s16 sFlashInterval;          // 0x80414648
     static u8 sGhostA;                  // 0x8041464a

include/Sato/ItemObjMgr.h

@@ -326,6 +326,7 @@ class ItemObjMgr : public SysDbUsrPage
     void setMaxItemMoveNum(const u8 &);
     void entryMiniGameList(ItemObj *);
     void tstEnableDrawGhost(bool, const JSUListIterator<ItemObj> &);
+    KartHitList* getKartHitList(int);
 
     static void createMgr() { gItemMgr = new ItemObjMgr(); }
     static ItemObjMgr *getItemObjMgr() { return gItemMgr; }

include/Sato/ItemTurtle.h

@@ -183,6 +183,7 @@ class ItemFireBall : public ItemGTurtle
     void initEffect();
     void initHaveEffect();
     virtual ~ItemFireBall() {} // 0x80249c9c
+    bool IsEfctTypeRed() const { return getItemColorID() == 1; }
 
     JPABaseEmitter *_2ec[3];
     JPABaseEmitter *_2f8[2];

include/Sato/JPEffectPerformer.h

@@ -11,12 +11,18 @@ class JPEffectPerformer
     enum EffectType
     {
         // TODO
+        Effect_Unknown0 = 0x0,
+        Effect_Unknown1 = 0x1,
+        Effect_Unknown2 = 0x2,
         Effect_Unknown4 = 0x4,      // Something collision related...?
         Effect_Unknown5 = 0x5,      // Sound of some material...?
         Effect_Unknown6 = 0x6,      // Something reflection related...?
+        Effect_UnknownD = 0xD,
+        Effect_UnknownF = 0xF,
         Effect_Unknown12 = 0x12,    // Star react.
         Effect_Burn = 0x13,
-        Effect_Star = 0x1c
+        Effect_Star = 0x1c,
+        Effect_Fireball = 0x24,
     };
 
     void init();                                                       // 80266010
@@ -102,4 +108,4 @@ class JPEffectPerformer
 // void JPStartFootSmokeEmitterCallBack::draw(JPABaseEmitter *);
 // void PermissionCounterObserver::reset();
 // void PermissionCounterObserver::calc();
-#endif // JPEFFECTPERFORMER_H
+#endif // JPEFFECTPERFORMER_H

include/Shiraiwa/TKartThrower.h

@@ -0,0 +1,16 @@
+#ifndef TKART_THROWER_H
+#define TKART_THROWER_H
+
+#include <JSystem/JGeometry.h>
+#include "JSystem/JGeometry/Vec.h"
+#include "Shiraiwa/Objects/MapObjHioNode.h"
+
+class TKartThrower : public TMapObjHioNode {
+public:
+    virtual ~TKartThrower() {}
+
+    virtual void getThrowDir(JGeometry::TVec3f* dst, s16);
+    virtual s32 getThrowPow();
+};
+
+#endif

include/Yamamoto/KartCrash.h

@@ -2,6 +2,10 @@
 #define KARTCRASH_H
 
 #include "Sato/ItemObj.h"
+#include "Sato/J3DEffectMgr.h"
+#include "Shiraiwa/TKartThrower.h"
+
+class KartBody;
 
 class KartCrash
 { // Autogenerated
@@ -38,7 +42,13 @@ class KartCrash
     // Inline/Unused
     // void MakeRollCrash();
 private:
-    u8 _0[0x14];
+    KartBody* mBody;
+    TKartThrower* _4;
+    J3DEffectObj* _8;
+    u8 _C;
+    u8 _D;
+    u16 _E;
+    u16 mMatchlessTimer;
 
 }; // 0x14
 

include/Yamamoto/KartDamage.h

@@ -39,4 +39,4 @@ class KartDamage
 
 }; // 0xc
 
-#endif // KARTDAMAGE_H
+#endif // KARTDAMAGE_H