Edits and fixes

Zephiles · Zephiles · commit a28d90c59e18 · 2018-06-17T15:31:36.000-05:00
Set up MarioLockHPToggleC to use the proper function to get the pointer to Mario's stats, use the proper atan2 function (as well as correcting the parameters), stopped using cmath, slight edit in InfiniteItemUsageA to save a line, fixed more pointers in parameters.
diff --git a/ttyd-tools/rel/Makefile b/ttyd-tools/rel/Makefile
@@ -78,7 +78,9 @@ endif
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project
 #---------------------------------------------------------------------------------
-LIBS	:= -lm
+# Temporarily remove the math library to avoid conflicts
+# LIBS	:= -lm
+LIBS	:= 
 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
diff --git a/ttyd-tools/rel/include/ttyd.eu.lst b/ttyd-tools/rel/include/ttyd.eu.lst
@@ -564,7 +564,7 @@
 // 800F9520:BattlePartyAnimeLoad
 // 800F9560:BattleGetPartnerPtr
 // 800F9594:BattleGetPartyPtr
-// 800F9614:BattleGetMarioPtr
+800F9614:BattleGetMarioPtr
 // 800F9680:BattleGetSystemPtr
 // 800F96E0:BattleGetUnitPartsPtr
 // 800F9720:BattleSetUnitPtr
@@ -824,8 +824,8 @@
 802713F0:strcpy
 // 802714A8:strlen
 
-// e_atan2.c
-80273220:__ieee754_atan2
+// w_atan2.c
+80276394:atan2
 
 // GXGeometry.c
 // 802B9A68:__GXSetDirtyState
diff --git a/ttyd-tools/rel/include/ttyd.jp.lst b/ttyd-tools/rel/include/ttyd.jp.lst
@@ -561,7 +561,7 @@
 // 800F3760:BattlePartyAnimeLoad
 // 800F37A0:BattleGetPartnerPtr
 // 800F37D4:BattleGetPartyPtr
-// 800F3854:BattleGetMarioPtr
+800F3854:BattleGetMarioPtr
 // 800F38C0:BattleGetSystemPtr
 // 800F3920:BattleGetUnitPartsPtr
 // 800F3960:BattleSetUnitPtr
@@ -821,8 +821,8 @@
 802675E4:strcpy
 // 8026769C:strlen
 
-// e_atan2.c
-80269414:__ieee754_atan2
+// w_atan2.c
+8026C588:atan2
 
 // GXGeometry.c
 // 802AFBE8:__GXSetDirtyState
diff --git a/ttyd-tools/rel/include/ttyd.us.lst b/ttyd-tools/rel/include/ttyd.us.lst
@@ -564,7 +564,7 @@
 // 800F86B4:BattlePartyAnimeLoad
 // 800F86F4:BattleGetPartnerPtr
 // 800F8728:BattleGetPartyPtr
-// 800F87A8:BattleGetMarioPtr
+800F87A8:BattleGetMarioPtr
 // 800F8814:BattleGetSystemPtr
 // 800F8874:BattleGetUnitPartsPtr
 // 800F88B4:BattleSetUnitPtr
@@ -824,8 +824,8 @@
 8026D5FC:strcpy
 // 8026D6B4:strlen
 
-// e_atan2.c
-8026F42C:__ieee754_atan2
+// w_atan2.c
+802725A0:atan2
 
 // GXGeometry.c
 // 802B59EC:__GXSetDirtyState
diff --git a/ttyd-tools/rel/include/ttyd/battle.h b/ttyd-tools/rel/include/ttyd/battle.h
@@ -0,0 +1,59 @@
+#pragma once
+
+#include <cstdint>
+
+namespace ttyd::battle {
+
+extern "C" {
+
+// BattleConsumeReserveItem
+// BattleStatusWindowCheck
+// BattleStatusWindowSystemOff
+// BattleStatusWindowEventOff
+// BattleStatusWindowSystemOn
+// BattleStatusWindowEventOn
+// BattleStatusWindowAPRecoveryOff
+// BattleStatusWindowAPRecoveryOn
+// BattleMajinaiEndCheck
+// BattleMajinaiDone
+// BattleMajinaiCheck
+// battleDisableHResetCheck
+// BattleAfterReactionMain
+// BattleAfterReactionRelease
+// BattleAfterReactionEntry
+// BattleAfterReactionQueueInit
+// BattleCheckUnitBroken
+// BattleGetFloorHeight
+// BattleGetStockExp
+// BattleStoreExp
+// BattleStoreCoin
+// BattlePartyInfoWorkInit
+// _EquipItem
+// BtlUnit_EquipItem
+// BattleTransPartyIdToUnitKind
+// BattleTransPartyId
+// BattleChangeParty
+// BattlePartyAnimeLoad
+// BattleGetPartnerPtr
+// BattleGetPartyPtr
+void *BattleGetMarioPtr(void *battleAddressesPointer);
+// BattleGetSystemPtr
+// BattleGetUnitPartsPtr
+// BattleSetUnitPtr
+// BattleGetUnitPtr
+// BattleFree
+// BattleAlloc
+// BattleIncSeq
+// BattleGetSeq
+// BattleSetSeq
+// BattleSetMarioParamToFieldBattle
+// Btl_UnitSetup
+// BattleEnd
+// BattleMain
+// BattleInit
+// battleSeqEndCheck
+// battleMain
+
+}
+
+}
diff --git a/ttyd-tools/rel/include/ttyd/e_atan2.h b/ttyd-tools/rel/include/ttyd/e_atan2.h
diff --git a/ttyd-tools/rel/include/ttyd/evtmgr.h b/ttyd-tools/rel/include/ttyd/evtmgr.h
@@ -24,7 +24,7 @@ bool evtCheckID(uint32_t threadID);
 // evtRestart
 // evtBrotherEntry
 // evtChildEntry
-uint32_t evtEntryType(uint32_t *script, uint32_t unk1, uint32_t unk2, uint32_t unk3);
+uint32_t evtEntryType(void *script, uint32_t unk1, uint32_t unk2, uint32_t unk3);
 // evtEntry
 // evtEntryRunCheck
 // evtmgrReInit
diff --git a/ttyd-tools/rel/include/ttyd/itemdrv.h b/ttyd-tools/rel/include/ttyd/itemdrv.h
@@ -25,7 +25,7 @@ extern "C" {
 // itemHitCheck
 // itemNameToPtr
 // itemDelete
-void *itemEntry(const char *name, uint32_t id, uint32_t mode, int32_t wasCollectedExpr, uint32_t *pickupScript, float coordinateX, float coordinateY, float coordinateZ);
+void *itemEntry(const char *name, uint32_t id, uint32_t mode, int32_t wasCollectedExpr, void *pickupScript, float coordinateX, float coordinateY, float coordinateZ);
 // itemModeChange
 // itemMain
 // unk_JP_US_PAL_023
diff --git a/ttyd-tools/rel/include/ttyd/w_atan2.h b/ttyd-tools/rel/include/ttyd/w_atan2.h
@@ -0,0 +1,11 @@
+#pragma once
+
+namespace ttyd::w_atan2 {
+
+extern "C" {
+
+double atan2(double coordinateY, double coordinateX);
+
+}
+
+}
diff --git a/ttyd-tools/rel/source/assembly/InfiniteItemUsageA.s b/ttyd-tools/rel/source/assembly/InfiniteItemUsageA.s
@@ -20,10 +20,7 @@ lis %r5,button_input_high
 lhz %r5,button_input_low(%r5)
 and %r5,%r5,%r12
 cmpw %r5,%r12
-bne+ Exit
-blr
-
-Exit:
+beqlr-
 stwu %sp,-0x20(%sp)
 
 BranchInfiniteItemUsage:
diff --git a/ttyd-tools/rel/source/codes/MarioLockHPToggleC.cpp b/ttyd-tools/rel/source/codes/MarioLockHPToggleC.cpp
@@ -3,6 +3,7 @@
 #include <ttyd/system.h>
 #include <ttyd/mariost.h>
 #include <ttyd/mario_pouch.h>
+#include <ttyd/battle.h>
 
 #include <cstdio>
 
@@ -38,16 +39,23 @@ void Mod::lockMarioHPToggle()
   {
     // Lock 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 MarioHPAddress = PouchAddress + 0x70;
+    int16_t MarioMaxHP = *reinterpret_cast<int16_t *>(PouchAddress + 0x72);
+    *reinterpret_cast<int16_t *>(MarioHPAddress) = MarioMaxHP; // Copy Max HP to Current HP
+    
     uint32_t BattleAddress = *reinterpret_cast<uint32_t *>(BattleAddressesStart);
     if (BattleAddress != 0)
     {
       // Currently in a battle
-      BattleAddress = *reinterpret_cast<uint32_t *>(BattleAddress + 0x24);
-      if (BattleAddress != 0)
+      uint32_t *BattleAddressPointer = reinterpret_cast<uint32_t *>(BattleAddress);
+      uint32_t MarioBattleAddress = reinterpret_cast<uint32_t>(ttyd::battle::BattleGetMarioPtr(BattleAddressPointer));
+      if (MarioBattleAddress != 0)
       {
-        // Make sure enemy info is there
-        *reinterpret_cast<int16_t *>(BattleAddress + 0x10C) = *reinterpret_cast<int16_t *>(BattleAddress + 0x108); // Copy Battle Max HP to Current Battle HP
+        // Make sure Mario's info is there
+        uint32_t BattleMarioHPAddress = MarioBattleAddress + 0x10C;
+        int16_t BattleMarioMaxHP = *reinterpret_cast<int16_t *>(MarioBattleAddress + 0x108);
+        *reinterpret_cast<int16_t *>(BattleMarioHPAddress) = BattleMarioMaxHP; // Copy Battle Max HP to Current Battle HP
       }
     }
     
diff --git a/ttyd-tools/rel/source/tricks/YoshiSkipC.cpp b/ttyd-tools/rel/source/tricks/YoshiSkipC.cpp
@@ -5,12 +5,11 @@
 #include <ttyd/string.h>
 #include <ttyd/system.h>
 #include <ttyd/mario.h>
-#include <ttyd/e_atan2.h>
+#include <ttyd/w_atan2.h>
 #include <ttyd/seqdrv.h>
 #include <ttyd/fontmgr.h>
 
 #include <cstdio>
-#include <cmath>
 
 extern uint16_t YoshiSkipEnableCombo;
 extern char *NextMap;
@@ -53,9 +52,11 @@ void Mod::yoshiSkip()
     {
       ttyd::mario::Player *player = ttyd::mario::marioGetPtr();
       bool MarioControl = player->flags1 & (1 << 0); // Check if 0 bit is active
+      
       double StickX = getStickValue(ttyd::system::keyGetStickX(0));
       double StickY = getStickValue(ttyd::system::keyGetStickY(0));
-      double stickAngle = (ttyd::e_atan2::__ieee754_atan2(StickX,StickY)) * (180 / M_PI);
+      double PI = 3.14159265358979323846;
+      double stickAngle = (ttyd::w_atan2::atan2(StickX,StickY)) * (180 / PI);
       
       if (stickAngle < 0)
       {
