Adjust pouchGetPtr() and use nullptr where appropriate

pouchGetPtr() returns a pointer, rather than a uint32_t.

Use nullptr where appropriate for clarity.

Author: Zephiles

ttyd-tools/rel/include/ttyd/mario_pouch.h

@@ -78,7 +78,7 @@ void pouchReviseMarioParam();
 // pouchHaveItem
 // pouchKeyItem
 // pouchInit
-uint32_t pouchGetPtr();
+void *pouchGetPtr();
 
 }
 

ttyd-tools/rel/source/codes/AddRemovePartnersC.cpp

@@ -22,7 +22,7 @@ void Mod::addOrRemovePartners()
   {
     // Currently in the partners menu
     uint32_t ButtonInput = ttyd::system::keyGetButton(0);
-    uint32_t PouchAddress = ttyd::mario_pouch::pouchGetPtr();
+    uint32_t PouchAddress = reinterpret_cast<uint32_t>(ttyd::mario_pouch::pouchGetPtr());
 
     if ((ButtonInput & AddPartnersCombo) == AddPartnersCombo)
     {

ttyd-tools/rel/source/codes/AdjustCoinCountSetSequenceC.cpp

@@ -33,7 +33,8 @@ void Mod::adjustCoinCountSetSequence()
   if ((ttyd::mariost::marioStGetSystemLevel() == 15) && (CurrentTab == 0))
   {
     // Currently in the pause menu and Current Tab is Mario's stats
-    uint32_t CoinCountAddress = ttyd::mario_pouch::pouchGetPtr() + 0x78;
+    uint32_t PouchAddress = reinterpret_cast<uint32_t>(ttyd::mario_pouch::pouchGetPtr());
+    uint32_t CoinCountAddress = PouchAddress + 0x78;
     int16_t CoinCount = *reinterpret_cast<int16_t *>(CoinCountAddress);
 
     uint32_t ButtonInput = ttyd::system::keyGetButton(0);

ttyd-tools/rel/source/codes/ChangeInventoryC.cpp

@@ -122,7 +122,7 @@ void Mod::changeInventory()
     uint32_t SubMenuEquippedBadges = *reinterpret_cast<uint32_t *>(PauseMenuAddress + 0x3E0);
     int32_t BadgesCurrentIndex = *reinterpret_cast<int32_t *>(PauseMenuAddress + 0x3E4);
 
-    uint32_t PouchAddress = ttyd::mario_pouch::pouchGetPtr();
+    uint32_t PouchAddress = reinterpret_cast<uint32_t>(ttyd::mario_pouch::pouchGetPtr());
     uint32_t PouchStandardInventoryAddress = PouchAddress + 0x192;
     uint32_t PouchBadgeInventoryAddress = PouchAddress + 0x1FA;
 

ttyd-tools/rel/source/codes/GameOverC.cpp

@@ -17,7 +17,7 @@ void Mod::gameOver()
     if (ttyd::seqdrv::seqGetNextSeq() != Logo)
     {
       // The game will crash if the following code runs during the Logo
-      ttyd::seqdrv::seqSetSeq(ttyd::seqdrv::SeqIndex::kGameOver, 0, 0);
+      ttyd::seqdrv::seqSetSeq(ttyd::seqdrv::SeqIndex::kGameOver, nullptr, nullptr);
     }
   }
 }

ttyd-tools/rel/source/codes/MarioLockHPToggleC.cpp

@@ -37,8 +37,8 @@ void Mod::lockMarioHPToggle()
   else
   {
     // Lock HP
-    uint32_t PouchPointer = ttyd::mario_pouch::pouchGetPtr();
-    *reinterpret_cast<int16_t *>(PouchPointer + 0x70) = *reinterpret_cast<int16_t *>(PouchPointer + 0x72); // Copy Max HP to Current HP
+    uint32_t PouchAddress = reinterpret_cast<uint32_t>(ttyd::mario_pouch::pouchGetPtr());
+    *reinterpret_cast<int16_t *>(PouchAddress + 0x70) = *reinterpret_cast<int16_t *>(PouchAddress + 0x72); // Copy Max HP to Current HP
     uint32_t BattleAddress = *reinterpret_cast<uint32_t *>(BattleAddressesStart);
     if (BattleAddress != 0)
     {

ttyd-tools/rel/source/codes/SpawnItemC.cpp

@@ -24,7 +24,8 @@ void Mod::spawnItem()
       if ((ttyd::seqdrv::seqGetNextSeq() == Game) && (ttyd::mariost::marioStGetSystemLevel() != 15))
       {
         // Not in pause menu
-        int16_t CoinCount = *reinterpret_cast<int16_t *>(ttyd::mario_pouch::pouchGetPtr() + 0x78);
+        uint32_t PouchAddress = reinterpret_cast<uint32_t>(ttyd::mario_pouch::pouchGetPtr());
+        int16_t CoinCount = *reinterpret_cast<int16_t *>(PouchAddress + 0x78);
 
         if ((CoinCount >= 1) && (CoinCount <= 338))
         {
@@ -51,7 +52,7 @@ void Mod::spawnItem()
             ItemCoordinateX += 30;
           }
 
-          ttyd::itemdrv::itemEntry(ItemName, CoinCount, 16, -1, 0, ItemCoordinateX, ItemCoordinateY, ItemCoordinateZ);
+          ttyd::itemdrv::itemEntry(ItemName, CoinCount, 16, -1, nullptr, ItemCoordinateX, ItemCoordinateY, ItemCoordinateZ);
           delete[] (ItemName);
         }
       }

ttyd-tools/rel/source/codes/WarpC.cpp

@@ -27,7 +27,8 @@ void Mod::warp()
     if ((ttyd::mariost::marioStGetSystemLevel() == 15) && (CurrentTab == 0))
     {
       // Currently in the pause menu, and Current Tab is Mario's stats
-      int16_t CoinCount = *reinterpret_cast<int16_t *>(ttyd::mario_pouch::pouchGetPtr() + 0x78);
+      uint32_t PouchAddress = reinterpret_cast<uint32_t>(ttyd::mario_pouch::pouchGetPtr());
+      int16_t CoinCount = *reinterpret_cast<int16_t *>(PouchAddress + 0x78);
       uint32_t WarpToMap = 0;
 
       switch (CoinCount)