0.3b

2 files changed, 17 insertions, 4 deletions

diff --git a/Externals/libtp b/Externals/libtp
-Subproject 0d6a0ecaa1acccc088cdeea9de65421be9672b1
+Subproject 55b37479b97b62c65ca53f91e666cf0ca72d19e
diff --git a/source/main.cpp b/source/main.cpp
index b26c24b..a1240f1 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -22,7 +22,7 @@ namespace mod
     {
         console = new libtp::display::Console("AECX", "Boss Rush", "Fast paced fighting action, beat boss after boss",
                                               "as quickly as possible. At the end of each fight",
-                                              "you'll be teleported to the next one...", "Version: 0.2b");
+                                              "you'll be teleported to the next one...", "Version: 0.3b");
 
         // Hook to a suitable function
         // This one runs every frame
@@ -288,10 +288,23 @@ namespace mod
     }
     void argarok()
     {
-        // 2nd clawshot
+        // Purge old clawshot from items
+        libtp::tp::d_com_inf_game::dComIfG_gameInfo.scratchPad.wQuestLogData[0xA5] = 0xFF;
+
+        // Add 2nd clawshot to items
         libtp::tp::d_com_inf_game::dComIfG_gameInfo.scratchPad.wQuestLogData[0xA6] = 0x47;
-        libtp::tp::d_com_inf_game::dComIfG_gameInfo.scratchPad.wQuestLogData[0xB4 + itemWheelPos] = 10;
-        itemWheelPos++;
+
+        // Set Double Clawshot into itemwheel position where clawshot was
+        libtp::tp::d_com_inf_game::dComIfG_gameInfo.scratchPad.wQuestLogData[0xB4 + clawshotItemWheelIndex] = 0xA;
+
+        // Remove from X/Y equip
+        u8* x = &libtp::tp::d_com_inf_game::dComIfG_gameInfo.scratchPad.wQuestLogData[0xB];
+        u8* y = &libtp::tp::d_com_inf_game::dComIfG_gameInfo.scratchPad.wQuestLogData[0xC];
+
+        if (*x == 9)
+            *x = 0xFF;
+        else if (*y == 9)
+            *y = 0xFF;
     }
     void phantomZant()
     {