ChangeInventoryC update + Fix another incorrect address

When adding a new item or badge, if the cursor is currently over an existing item or badge, then the one added will be the same as the one that the cursor is over.

Author: Zephiles

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

@@ -16,7 +16,7 @@ extern uint16_t InventoryRemoveItemOrBadgeFirstButtonCombo;
 extern uint16_t InventoryPreviousValueFirstButtonCombo;
 extern uint16_t InventoryNextValueFirstButtonCombo;
 
-void addItemOrBadge(uint32_t PouchAddress, uint16_t ItemOrBadge, int16_t LoopCounter, uint32_t SubMenu)
+void addItemOrBadge(uint32_t PouchAddress, uint32_t CursorCurrentItem, uint16_t ItemOrBadge, int16_t LoopCounter, uint32_t SubMenu)
 {
   if (SubMenu != 1)
   {
@@ -32,6 +32,12 @@ void addItemOrBadge(uint32_t PouchAddress, uint16_t ItemOrBadge, int16_t LoopCou
       else
       {
         // Slot is empty, so add item
+        if ((CursorCurrentItem >= 1) && (CursorCurrentItem <= 338))
+        {
+          // Add selected item/badge
+          ItemOrBadge = CursorCurrentItem;
+        }
+        
         *reinterpret_cast<uint16_t *>(PouchAddress) = ItemOrBadge;
         break;
       }
@@ -156,12 +162,12 @@ void Mod::changeInventory()
         if (CurrentTab == 2)
         {
           // Standard items menu
-          addItemOrBadge(PouchStandardInventoryAddress, GoldBar, StandardItemsLoopCounter, SubMenuImportantItems);
+          addItemOrBadge(PouchStandardInventoryAddress, CursorItem, GoldBar, StandardItemsLoopCounter, SubMenuImportantItems);
         }
         else if (CurrentTab == 3)
         {
           // Badges menu
-          addItemOrBadge(PouchBadgeInventoryAddress, PowerJump, BadgesLoopCounter, SubMenuEquippedBadges);
+          addItemOrBadge(PouchBadgeInventoryAddress, CursorItem, PowerJump, BadgesLoopCounter, SubMenuEquippedBadges);
         }
       }
       ChangeInventoryButtonHoldCounter++;

ttyd-tools/rel/source/global.cpp

@@ -9,7 +9,7 @@ extern "C" {
   uint32_t r13 = 0x8041CF20;
   uint32_t NPCAddressesStart = r13 + 0x19A0;
   uint32_t PauseMenuAddressesStart = r13 + 0x1D10;
-  uint32_t BattleAddressesStart = r13 + 0x1BE0;
+  uint32_t BattleAddressesStart = r13 + 0x1C70;
   char *NextBero = reinterpret_cast<char *>(r13 + 0x1688);
   char *NextMap = reinterpret_cast<char *>(r13 + 0x16A8);
   char *NextArea = reinterpret_cast<char *>(r13 + 0x16C8);
@@ -25,7 +25,7 @@ extern "C" {
   uint32_t r13 = 0x80429760;
   uint32_t NPCAddressesStart = r13 + 0x1A80;
   uint32_t PauseMenuAddressesStart  = r13 + 0x1DF0;
-  uint32_t BattleAddressesStart  = r13 + 0x1CC0;
+  uint32_t BattleAddressesStart  = r13 + 0x1D50;
   char *NextBero = reinterpret_cast<char *>(r13 + 0x1768);
   char *NextMap = reinterpret_cast<char *>(r13 + 0x1788);
   char *NextArea = reinterpret_cast<char *>(r13 + 0x17A8);