Skip to content

Commit a9a9a06

Browse files
ZephilesZephiles
committed
More global variables
Also removed an unnecessary extern in YoshiSkipC.
1 parent cfe3453 commit a9a9a06

File tree

10 files changed

+33
-71
lines changed

10 files changed

+33
-71
lines changed

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

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <cstdio>
99

10-
extern uint32_t r13;
10+
extern uint32_t PauseMenuAddressesStart;
1111
extern uint16_t AddPartnersCombo;
1212
extern uint16_t RemovePartnersCombo;
1313

@@ -17,17 +17,8 @@ void Mod::addOrRemovePartners()
1717
{
1818
if (ttyd::mariost::marioStGetSystemLevel() == 15)
1919
{
20-
// Currently in the pause menu
21-
22-
#ifdef TTYD_US
23-
uint32_t PauseMenuAddress = r13 + 0x1D10;
24-
#elif defined TTYD_JP
25-
uint32_t PauseMenuAddress = r13 + 0x17B0;
26-
#elif defined TTYD_EU
27-
uint32_t PauseMenuAddress = r13 + 0x1DF0;
28-
#endif
29-
30-
PauseMenuAddress = *reinterpret_cast<uint32_t *>(PauseMenuAddress);
20+
// Currently in the pause menu
21+
uint32_t PauseMenuAddress = *reinterpret_cast<uint32_t *>(PauseMenuAddressesStart);
3122
uint32_t CurrentTab = *reinterpret_cast<uint32_t *>(PauseMenuAddress + 0x40);
3223

3324
if (CurrentTab == 1)

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <cstdio>
99

10-
extern uint32_t r13;
10+
extern uint32_t PauseMenuAddressesStart;
1111
extern uint16_t CoinsSetToZeroCombo;
1212
extern uint16_t CoinsSetSequenceCombo;
1313
extern uint16_t CoinsIncrement1Combo;
@@ -29,16 +29,8 @@ void Mod::adjustCoinCountSetSequence()
2929
{
3030
if (ttyd::mariost::marioStGetSystemLevel() == 15)
3131
{
32-
// Currently in the pause menu
33-
#ifdef TTYD_US
34-
uint32_t PauseMenuAddress = r13 + 0x1D10;
35-
#elif defined TTYD_JP
36-
uint32_t PauseMenuAddress = r13 + 0x17B0;
37-
#elif defined TTYD_EU
38-
uint32_t PauseMenuAddress = r13 + 0x1DF0;
39-
#endif
40-
41-
PauseMenuAddress = *reinterpret_cast<uint32_t *>(PauseMenuAddress);
32+
// Currently in the pause menu
33+
uint32_t PauseMenuAddress = *reinterpret_cast<uint32_t *>(PauseMenuAddressesStart);
4234
uint32_t CurrentTab = *reinterpret_cast<uint32_t *>(PauseMenuAddress + 0x40);
4335

4436
uint32_t CoinCountAddress = ttyd::mario_pouch::pouchGetPtr() + 0x78;

‎ttyd-tools/rel/source/codes/BobberyEarlyC.cpp‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,21 @@
55

66
#include <cstdio>
77

8-
extern uint32_t r13;
8+
extern uint32_t GSWAddressesStart;
9+
extern uint32_t NPCAddressesStart;
910
extern char *NextMap;
1011

1112
namespace mod {
1213

1314
void Mod::bobberyEarly()
1415
{
1516
// Turn off GSWF(3137)
16-
uint32_t GSWFAddressesStart = *reinterpret_cast<uint32_t *>(r13 - 0x6F50);
17+
uint32_t GSWFAddressesStart = *reinterpret_cast<uint32_t *>(GSWAddressesStart);
1718
*reinterpret_cast<uint32_t *>(GSWFAddressesStart + 0x300) &= ~(1 << 1); // Turn off the 1 bit
1819

1920
if (ttyd::string::strcmp(NextMap, reinterpret_cast<char *>(muj_05)) == 0)
2021
{
21-
#ifdef TTYD_US
22-
uint32_t NPCAddress = r13 + 0x19A0;
23-
#elif defined TTYD_JP
24-
uint32_t NPCAddress = r13 + 0x1448;
25-
#elif defined TTYD_EU
26-
uint32_t NPCAddress = r13 + 0x1A80;
27-
#endif
28-
29-
NPCAddress = *reinterpret_cast<uint32_t *>(NPCAddress);
22+
uint32_t NPCAddress = *reinterpret_cast<uint32_t *>(NPCAddressesStart);
3023
NPCAddress += 0x1040; // NPC 6
3124

3225
// Allow the Ember to be refought

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <cstdio>
88

9-
extern uint32_t r13;
9+
extern uint32_t PauseMenuAddressesStart;
1010
extern uint16_t InventoryAddItemOrBadgeCombo;
1111
extern uint16_t InventoryRemoveItemOrBadgeCombo;
1212
extern uint16_t InventoryPreviousValueCombo;
@@ -104,19 +104,11 @@ void Mod::changeInventory()
104104
if (ttyd::mariost::marioStGetSystemLevel() == 15)
105105
{
106106
// Currently in the pause menu
107-
#ifdef TTYD_US
108-
uint32_t PauseMenuAddress = r13 + 0x1D10;
109-
#elif defined TTYD_JP
110-
uint32_t PauseMenuAddress = r13 + 0x17B0;
111-
#elif defined TTYD_EU
112-
uint32_t PauseMenuAddress = r13 + 0x1DF0;
113-
#endif
114-
115107
uint32_t ButtonInput = ttyd::system::keyGetButton(0);
116108
uint8_t PressedOrHeldButtonCount = 0;
117109
uint16_t ButtonHoldFrames = 45; // 0.75 Seconds
118110

119-
PauseMenuAddress = *reinterpret_cast<uint32_t *>(PauseMenuAddress);
111+
uint32_t PauseMenuAddress = *reinterpret_cast<uint32_t *>(PauseMenuAddressesStart);
120112
uint32_t CursorItem = *reinterpret_cast<uint32_t *>(PauseMenuAddress + 0x138);
121113
uint32_t CurrentTab = *reinterpret_cast<uint32_t *>(PauseMenuAddress + 0x40);
122114
uint32_t SubMenuImportantItems = *reinterpret_cast<uint32_t *>(PauseMenuAddress + 0x210);

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <cstdio>
77

8-
extern uint32_t r13;
8+
extern uint32_t BattleAddressesStart;
99
extern uint16_t LockMarioHPToggleCombo;
1010

1111
namespace mod {
@@ -36,16 +36,7 @@ void Mod::lockMarioHPToggle()
3636
// Lock HP
3737
uint32_t PouchPointer = ttyd::mario_pouch::pouchGetPtr();
3838
*reinterpret_cast<int16_t *>(PouchPointer + 0x70) = *reinterpret_cast<int16_t *>(PouchPointer + 0x72); // Copy Max HP to Current HP
39-
40-
#ifdef TTYD_US
41-
uint32_t BattleAddress = r13 + 0x1BE0;
42-
#elif defined TTYD_JP
43-
uint32_t BattleAddress = r13 + 0x1710;
44-
#elif defined TTYD_EU
45-
uint32_t BattleAddress = r13 + 0x1CC0;
46-
#endif
47-
48-
BattleAddress = *reinterpret_cast<uint32_t *>(BattleAddress);
39+
uint32_t BattleAddress = *reinterpret_cast<uint32_t *>(BattleAddressesStart);
4940
if (BattleAddress != 0)
5041
{
5142
// Currently in a battle

‎ttyd-tools/rel/source/codes/ResetGSWFFlagsC.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include <cstdio>
66

7-
extern uint32_t r13;
7+
extern uint32_t GSWAddressesStart;
88
extern uint16_t ResetGSWFFlagsCombo;
99

1010
namespace mod {
@@ -13,7 +13,7 @@ void Mod::resetGSWFFlags()
1313
{
1414
if ((ttyd::system::keyGetButton(0) & ResetGSWFFlagsCombo) == ResetGSWFFlagsCombo)
1515
{
16-
uint32_t GSWFFlagsAddressesStart = *reinterpret_cast<uint32_t *>(r13 - 0x6F50);
16+
uint32_t GSWFFlagsAddressesStart = *reinterpret_cast<uint32_t *>(GSWAddressesStart);
1717
GSWFFlagsAddressesStart += 0x178;
1818

1919
for (int i = 0; i < 178; i++)

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <cstdio>
1111

12-
extern uint32_t r13;
12+
extern uint32_t PauseMenuAddressesStart;
1313
extern uint16_t WarpCombo;
1414
extern char *NextBero;
1515
extern char *NextMap;
@@ -31,17 +31,14 @@ void Mod::warp()
3131
{
3232
// Currently in the pause menu
3333
#ifdef TTYD_US
34-
uint32_t PauseMenuAddress = r13 + 0x1D10;
3534
char *minnnanokoe = reinterpret_cast<char *>(0x802ECF74);
3635
#elif defined TTYD_JP
37-
uint32_t PauseMenuAddress = r13 + 0x17B0;
3836
char *minnnanokoe = reinterpret_cast<char *>(0x802ECB70);
3937
#elif defined TTYD_EU
40-
uint32_t PauseMenuAddress = r13 + 0x1DF0;
4138
char *minnnanokoe = reinterpret_cast<char *>(0x802F8BD4);
4239
#endif
4340

44-
PauseMenuAddress = *reinterpret_cast<uint32_t *>(PauseMenuAddress);
41+
uint32_t PauseMenuAddress = *reinterpret_cast<uint32_t *>(PauseMenuAddressesStart);
4542
uint32_t CurrentTab = *reinterpret_cast<uint32_t *>(PauseMenuAddress + 0x40);
4643
int16_t CoinCount = *reinterpret_cast<int16_t *>(ttyd::mario_pouch::pouchGetPtr() + 0x78);
4744

‎ttyd-tools/rel/source/global.cpp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,31 @@ extern "C" {
77
// --Global Variables--
88
#ifdef TTYD_US
99
uint32_t r13 = 0x8041CF20;
10+
uint32_t NPCAddressesStart = r13 + 0x19A0;
11+
uint32_t PauseMenuAddressesStart = r13 + 0x1D10;
12+
uint32_t BattleAddressesStart = r13 + 0x1BE0;
1013
char *NextBero = reinterpret_cast<char *>(r13 + 0x1688);
1114
char *NextMap = reinterpret_cast<char *>(r13 + 0x16A8);
1215
char *NextArea = reinterpret_cast<char *>(r13 + 0x16C8);
1316
#elif defined TTYD_JP
1417
uint32_t r13 = 0x80417260;
18+
uint32_t NPCAddressesStart = r13 + 0x1448;
19+
uint32_t PauseMenuAddressesStart = r13 + 0x17B0;
20+
uint32_t BattleAddressesStart = r13 + 0x1710;
1521
char *NextBero = reinterpret_cast<char *>(r13 + 0x1128);
1622
char *NextMap = reinterpret_cast<char *>(r13 + 0x1148);
1723
char *NextArea = reinterpret_cast<char *>(r13 + 0x1168);
1824
#elif defined TTYD_EU
1925
uint32_t r13 = 0x80429760;
26+
uint32_t NPCAddressesStart = r13 + 0x1A80;
27+
uint32_t PauseMenuAddressesStart = r13 + 0x1DF0;
28+
uint32_t BattleAddressesStart = r13 + 0x1CC0;
2029
char *NextBero = reinterpret_cast<char *>(r13 + 0x1768);
2130
char *NextMap = reinterpret_cast<char *>(r13 + 0x1788);
2231
char *NextArea = reinterpret_cast<char *>(r13 + 0x17A8);
2332
#endif
2433

34+
uint32_t GSWAddressesStart = r13 - 0x6F50;
2535
bool ArtAttackHitboxesEnabled = false;
2636
bool ArtAttackHitboxesDenyInputs = false;
2737

@@ -106,7 +116,7 @@ uint16_t ButtonInputDisplayEnableCombo = PAD_B | PAD_X;
106116
// Infinite Item Usage
107117
uint16_t InfiniteItemsUsageCombo = PAD_Y;
108118

109-
// Art Attack hitboxes
119+
// Art Attack Hitboxes
110120
uint16_t ArtAttackHitboxesCombo = PAD_R | PAD_A;
111121

112122
}

‎ttyd-tools/rel/source/tricks/PalaceSkipC.cpp‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include <cstdio>
1515

16-
extern uint32_t r13;
16+
extern uint32_t NPCAddressesStart;
1717
extern uint16_t PalaceSkipEnableCombo;
1818
extern char *NextMap;
1919

@@ -45,13 +45,10 @@ void Mod::palaceSkip()
4545
if (mPalaceSkipInfoEnabled)
4646
{
4747
#ifdef TTYD_US
48-
uint32_t NPCAddress = r13 + 0x19A0;
4948
uint32_t FieldItemsAddress = 0x803DC294;
5049
#elif defined TTYD_JP
51-
uint32_t NPCAddress = r13 + 0x1448;
5250
uint32_t FieldItemsAddress = 0x803D8714;
5351
#elif defined TTYD_EU
54-
uint32_t NPCAddress = r13 + 0x1A80;
5552
uint32_t FieldItemsAddress = 0x803E82F4;
5653
#endif
5754

@@ -61,8 +58,8 @@ void Mod::palaceSkip()
6158
uint32_t PartnerPointer = ttyd::party::partyGetPtr(ttyd::mario_party::marioGetPartyId());
6259
float partnerCoordinateY;
6360

64-
uint32_t NPCAddressesStart = *reinterpret_cast<uint32_t *>(NPCAddress);
65-
uint32_t NPCActive = *reinterpret_cast<uint32_t *>(NPCAddressesStart + 0x340); // NPC 2
61+
uint32_t NPCAddresses = *reinterpret_cast<uint32_t *>(NPCAddressesStart);
62+
uint32_t NPCActive = *reinterpret_cast<uint32_t *>(NPCAddresses + 0x340); // NPC 2
6663
float phantomEmberCoordinateY;
6764

6865
uint32_t FieldItemsAddressesStart = *reinterpret_cast<uint32_t *>(FieldItemsAddress);
@@ -126,7 +123,7 @@ void Mod::palaceSkip()
126123
if (NPCActive)
127124
{
128125
// NPC 2 is active, so set phantomEmberCoordinateY
129-
phantomEmberCoordinateY = *reinterpret_cast<float *>(NPCAddressesStart + 0x340 + 0x90); // NPC 2 Coordinate Y
126+
phantomEmberCoordinateY = *reinterpret_cast<float *>(NPCAddresses + 0x340 + 0x90); // NPC 2 Coordinate Y
130127
}
131128
else
132129
{

‎ttyd-tools/rel/source/tricks/YoshiSkipC.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <cstdio>
1313
#include <cmath>
1414

15-
extern uint32_t r13;
1615
extern uint16_t YoshiSkipEnableCombo;
1716
extern char *NextMap;
1817

0 commit comments

Comments
 (0)