Show OT gender on Pokemon summary screen

zaksabeast · Jul 2, 2020 · bb40948 · bb40948
1 parent f8365fb
commit bb40948
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 0 deletions.
diff --git a/CaptureSight-Applet/source/ui/views/PokemonSummaryView.cpp b/CaptureSight-Applet/source/ui/views/PokemonSummaryView.cpp
@@ -34,6 +34,7 @@ namespace ui {
     ADD_BODY_ROW(m_miscTable, friendshipTranslationKey, "app", std::to_string(pkm->getCurrentFriendship()));
     ADD_BODY_ROW(m_miscTable, "EC", "app", csight::utils::convertNumToHexString(pkm->getEncryptionConstant()));
     ADD_BODY_ROW(m_miscTable, "PID", "app", csight::utils::convertNumToHexString(pkm->getPID()));
+    ADD_BODY_ROW(m_miscTable, "OT Gender", "app", pkm->getOTGenderString());
 
     m_ivTable = new brls::Table();
     m_ivTable->addRow(brls::TableRowType::HEADER, "IVs");

diff --git a/libcsight/include/csight/Gender.hpp b/libcsight/include/csight/Gender.hpp
@@ -0,0 +1,7 @@
+namespace csight {
+  enum Gender {
+    Male = 0,
+    Female = 1,
+    Genderless = 2,
+  };
+}
diff --git a/libcsight/include/csight/PK8.hpp b/libcsight/include/csight/PK8.hpp
@@ -50,6 +50,8 @@ namespace csight {
     u8 getHTFriendship();
     u8 getOTFriendship();
     u8 getCurrentFriendship();
+    Gender getOTGender();
+    std::string PK8::getOTGenderString();
     u64 getRaidSeed();
     std::future<u64> getRaidSeedAsync();
     u16 getForm();

diff --git a/libcsight/include/csight/Utils.hpp b/libcsight/include/csight/Utils.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <csight/Gender.hpp>
 #include <csight/RaidTemplateTables.hpp>
 #include <csight/Shiny.hpp>
 #include <csight/lookups/Types.hpp>
@@ -54,6 +55,8 @@ namespace csight::utils {
 
   std::string getShinyTypeString(shiny::ShinyType type);
 
+  std::string getGenderString(Gender gender);
+
   std::vector<type::TypeMultiplier> calculateWeakness(type::PokemonType type1, type::PokemonType type2);
 
   std::string convertFloatWithPrecision(float num, u32 precision);

diff --git a/libcsight/include/csight/core b/libcsight/include/csight/core
@@ -5,6 +5,7 @@
 #include <csight/Den.hpp>
 #include <csight/DenHashes.hpp>
 #include <csight/GameReader.hpp>
+#include <csight/Gender.hpp>
 #include <csight/PK8.hpp>
 #include <csight/RNG.hpp>
 #include <csight/RaidDetails.hpp>

diff --git a/libcsight/source/csight/PK8.cpp b/libcsight/source/csight/PK8.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <csight/CalculateRaidSeed.hpp>
+#include <csight/Gender.hpp>
 #include <csight/PK8.hpp>
 #include <csight/PKM.hpp>
 #include <csight/RNG.hpp>
@@ -197,6 +198,13 @@ namespace csight {
 
   u8 PK8::getCurrentFriendship() { return this->getCurrentHandler() == 0 ? this->getOTFriendship() : this->getHTFriendship(); }
 
+  Gender PK8::getOTGender() {
+    u8 genderByte = *(u8 *)(m_data + 0x125) >> 7;
+    return genderByte < 2 ? (Gender)genderByte : Gender::Genderless;
+  }
+
+  std::string PK8::getOTGenderString() { return utils::getGenderString(this->getOTGender()); }
+
   u64 PK8::getRaidSeed() { return raid::calculateRaidSeed(this->getEncryptionConstant(), this->getPID(), this->getIVs()); }
 
   std::future<u64> PK8::getRaidSeedAsync() {

diff --git a/libcsight/source/csight/Utils.cpp b/libcsight/source/csight/Utils.cpp
@@ -100,6 +100,18 @@ namespace csight::utils {
     }
   }
 
+  std::string getGenderString(Gender gender) {
+    switch (gender) {
+      case Gender::Male:
+        return "Male";
+      case Gender::Female:
+        return "Female";
+      case Gender::Genderless:
+      default:
+        return "Genderless";
+    }
+  }
+
   std::vector<type::TypeMultiplier> calculateWeakness(type::PokemonType type1, type::PokemonType type2) {
     auto type1Weaknesses = weaknessChart[type1];
     auto type2Weaknesses = weaknessChart[type2];