Match CMemoryCardDriver::UpdateCardProbe()

Author: Antidote

include/Kyoto/Animation/CPASAnimInfo.hpp

@@ -8,11 +8,14 @@
 class CPASAnimInfo {
 public:
   CPASAnimInfo(int id);
-  CPASAnimInfo(int id, const rstl::reserved_vector<CPASAnimParm::UParmValue, 8>& parms);
+  CPASAnimInfo(int id, const rstl::reserved_vector< CPASAnimParm::UParmValue, 8 >& parms);
 
   int GetAnimId() const { return x0_id; }
   CPASAnimParm GetAnimParmData(uint idx, CPASAnimParm::EParmType type) const;
   const CPASAnimParm::UParmValue& GetAnimParmValue(uint idx) const;
+
+  bool operator<(const CPASAnimInfo& rhs) const { return x0_id < rhs.x0_id; }
+
 private:
   uint x0_id;
   rstl::reserved_vector< CPASAnimParm::UParmValue, 8 > x4_parms;

include/Kyoto/Animation/CPASAnimState.hpp

@@ -13,6 +13,9 @@
 
 class CPASAnimState {
 public:
+  CPASAnimState(int id);
+  CPASAnimState(CInputStream& in);
+  
   CPASAnimParm GetAnimParmData(int, unsigned int) const;
 
   pas::EAnimationState GetStateId() const { return x0_id; }

src/Kyoto/Animation/CPASAnimState.cpp

@@ -0,0 +1,54 @@
+#include "Kyoto/Animation/CPASAnimState.hpp"
+
+#include "Kyoto/Streams/CInputStream.hpp"
+#include "rstl/algorithm.hpp"
+
+CPASAnimState::CPASAnimState(const int id) : x0_id(static_cast< pas::EAnimationState >(id)) {}
+
+CPASAnimState::CPASAnimState(CInputStream& in) : x0_id(pas::kAS_Invalid) {
+  x0_id = static_cast<pas::EAnimationState>(in.Get<int>());
+  const uint parmCount = in.Get< uint >();
+  const uint animCount = in.Get< uint >();
+
+  x4_parms.reserve(parmCount);
+  x14_anims.reserve(animCount);
+  x24_selectionCache.reserve(animCount);
+
+  for (int i = 0; i < parmCount; i++) {
+    x4_parms.push_back(in.Get< CPASParmInfo >());
+  }
+
+  for (int i = 0; i < animCount; i++) {
+    int id = in.Get< int >();
+    rstl::reserved_vector< CPASAnimParm::UParmValue, 8 > parms;
+    for (int j = 0; j < parmCount; j++) {
+      CPASAnimParm::UParmValue val;
+      switch (x4_parms[i].GetParameterType()) {
+      case CPASAnimParm::kPT_Int32:
+        val.m_int = in.Get< int >();
+        break;
+      case CPASAnimParm::kPT_UInt32:
+        val.m_uint = in.Get< uint >();
+        break;
+      case CPASAnimParm::kPT_Float:
+        val.m_float = in.Get< float >();
+        break;
+      case CPASAnimParm::kPT_Bool:
+        val.m_bool = in.Get< bool >();
+        break;
+      case CPASAnimParm::kPT_Enum:
+        val.m_uint = in.Get< uint >();
+        break;
+      default:
+        val.m_int = 0;
+        break;
+      }
+
+      parms.push_back(val);
+    }
+    CPASAnimInfo animInfo(id, parms);
+    rstl::vector< CPASAnimInfo >::iterator iter = rstl::lower_bound(
+        x14_anims.begin(), x14_anims.end(), animInfo, rstl::less< CPASAnimInfo >());
+    x14_anims.insert(iter, animInfo);
+  }
+}

src/MetroidPrime/CMemoryCardDriver.cpp

@@ -383,41 +383,25 @@ void CMemoryCardDriver::UpdateCardProbe() {
   ProbeResults result = CMemoryCardSys::IsMemoryCardInserted(x0_cardPort);
   ECardResult error = result.x0_error;
 
-  if (error == kCR_READY && result.x8_sectorSize != 0x2000) {
-    x10_state = kS_CardProbeFailed;
-    x14_error = kE_CardNon8KSectors;
-  } else if (error != kCR_BUSY) {
-    if (error == kCR_WRONGDEVICE) {
+  if (error == kCR_READY) {
+    if (result.x8_sectorSize != 0x2000) {
       x10_state = kS_CardProbeFailed;
-      x14_error = kE_CardWrongDevice;
-    } else if (error != kCR_READY) {
-      NoCardFound();
-    } else {
-      x10_state = kS_CardProbeDone;
-      StartMountCard();
+      x14_error = kE_CardNon8KSectors;
+      return;
     }
+  } else if (error == kCR_BUSY) {
+    return;
+  } else if (error == kCR_WRONGDEVICE) {
+    x10_state = kS_CardProbeFailed;
+    x14_error = kE_CardWrongDevice;
+    return;
+  } else {
+    NoCardFound();
+    return;
   }
 
-  // switch (result.x0_error) {
-  // case kCR_READY:
-  //   if (result.x8_sectorSize != 0x2000) {
-  //     x10_state = kS_CardProbeFailed;
-  //     x14_error = kE_CardNon8KSectors;
-  //   } else {
-  //     x10_state = kS_CardProbeDone;
-  //     StartMountCard();
-  //   }
-  //   break;
-  // case kCR_BUSY:
-  //   break;
-  // case kCR_WRONGDEVICE:
-  //   x10_state = kS_CardProbeFailed;
-  //   x14_error = kE_CardWrongDevice;
-  //   break;
-  // default:
-  //   NoCardFound();
-  //   break;
-  // }
+  x10_state = kS_CardProbeDone;
+  StartMountCard();
 }
 
 void CMemoryCardDriver::StartMountCard() {