Skip to content

Commit f84dd8b

Browse files
ZephilesZephiles
committed
Removed all uses of Return in the menus
1 parent cebb6b6 commit f84dd8b

File tree

7 files changed

+370
-697
lines changed

7 files changed

+370
-697
lines changed

‎ttyd-tools/rel/include/draw.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ void drawTextWithWindow(const char *text, int32_t textPosX, int32_t textPosY, ui
2626
uint32_t textColor, float textScale, int32_t windowWidth, uint32_t windowColor, float windowCurve);
2727

2828
void drawSingleColumnMain();
29-
void drawSingleColumn(uint32_t maxOptionsPerPage, uint32_t currentPage);
29+
void drawSingleColumnSelectedOption();
30+
void drawSingleColumn(uint32_t maxOptionsPerPage, uint32_t currentPage, bool adjustSelectedOption);
3031

3132
void drawMultipleColumnsVertical(int32_t posX, int32_t posY, uint32_t currentMenuOption,
3233
uint32_t currentPage, uint32_t size, uint32_t maxOptionsPerPage,

‎ttyd-tools/rel/include/global.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@ enum CHEATS_MANAGE_FLAGS_SELECTION
113113

114114
enum CHEATS_MANAGE_GLOBAL_WORDS_SELECTION
115115
{
116-
CHANGE_GLOBAL_WORD = 1,
116+
CHANGE_GLOBAL_WORD = 0,
117117
CHANGE_GLOBAL_WORD_VALUE,
118118
SET_GLOBAL_WORD_VALUE,
119119
};
120120

121121
enum CHEATS_MANAGE_GLOBAL_FLAGS_SELECTION
122122
{
123-
CHANGE_GLOBAL_FLAG = 1,
123+
CHANGE_GLOBAL_FLAG = 0,
124124
SET_GLOBAL_FLAG,
125125
};
126126

@@ -350,8 +350,8 @@ enum ONSCREEN_TIMER_BUTTON_CODES
350350

351351
enum WARPS_OPTIONS
352352
{
353-
WARP_BY_INDEX = 1,
354-
SELECT_WARP,
353+
SELECT_WARP = 1,
354+
WARP_BY_INDEX,
355355
};
356356

357357
enum WARPS_SELECTION_OPTIONS

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

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -519,10 +519,18 @@ void drawSingleColumnMain()
519519
uint32_t tempTotalMenuOptions = Menu[CurrentMenu].TotalMenuOptions;
520520
uint32_t tempCurrentPage = 0;
521521

522-
drawSingleColumn(tempTotalMenuOptions, tempCurrentPage);
522+
drawSingleColumn(tempTotalMenuOptions, tempCurrentPage, false);
523523
}
524524

525-
void drawSingleColumn(uint32_t maxOptionsPerPage, uint32_t currentPage)
525+
void drawSingleColumnSelectedOption()
526+
{
527+
uint32_t tempTotalMenuOptions = Menu[CurrentMenu].TotalMenuOptions;
528+
uint32_t tempCurrentPage = 0;
529+
530+
drawSingleColumn(tempTotalMenuOptions, tempCurrentPage, true);
531+
}
532+
533+
void drawSingleColumn(uint32_t maxOptionsPerPage, uint32_t currentPage, bool adjustSelectedOption)
526534
{
527535
uint32_t tempCurrentMenu = CurrentMenu;
528536
uint32_t tempSelectedOption = SelectedOption;
@@ -548,6 +556,10 @@ void drawSingleColumn(uint32_t maxOptionsPerPage, uint32_t currentPage)
548556
{
549557
CurrentOptionCheck = CurrentMenuOption == i;
550558
}
559+
else if (adjustSelectedOption)
560+
{
561+
CurrentOptionCheck = (tempSelectedOption - 1) == i;
562+
}
551563
else
552564
{
553565
CurrentOptionCheck = tempSelectedOption == i;
@@ -996,7 +1008,7 @@ void drawMarioStats()
9961008
float TextScale = 0.6;
9971009
float IconScale = 0.6;
9981010
int32_t TextPosX = -208;
999-
int32_t TextPosY = 120;
1011+
int32_t TextPosY = 140;
10001012
int32_t ValuesPosX = TextPosX + 105;
10011013
int32_t IconPosX = TextPosX - 15;
10021014
int32_t IconPosY = TextPosY - 20;
@@ -1092,7 +1104,7 @@ void drawMarioStats()
10921104
float SpecialMovesScale = 0.37;
10931105
int16_t SpecialMoveIcon;
10941106
IconPosition[IconPositionX] = 133;
1095-
IconPosition[IconPositionY] = 46;
1107+
IconPosition[IconPositionY] = 66;
10961108

10971109
int16_t SpecialMovesBits = *reinterpret_cast<int16_t *>(PouchPtr + 0x8C);
10981110
for (uint32_t i = 0; i < 8; i++)
@@ -1121,12 +1133,6 @@ void drawPartnerStats()
11211133
uint32_t tempCurrentMenuOption = CurrentMenuOption;
11221134
uint32_t tempSelectedOption = SelectedOption;
11231135

1124-
// Only display if a partner is selected
1125-
if ((tempSelectedOption == 0) && (tempCurrentMenuOption == 0))
1126-
{
1127-
return;
1128-
}
1129-
11301136
// Create array for each stat to go in
11311137
int16_t PartnerStats[3];
11321138
clearMemory(PartnerStats, sizeof(PartnerStats));
@@ -1357,7 +1363,7 @@ void drawBattlesActorStats()
13571363
uint32_t Color = 0xFFFFFFFF;
13581364
uint8_t Alpha = 0xFF;
13591365
int32_t NamePosX = -232;
1360-
int32_t NamePosY = 0;
1366+
int32_t NamePosY = 20;
13611367
float Scale = 0.6;
13621368

13631369
uint32_t CurrentActor = *reinterpret_cast<uint32_t *>(ActorAddress + 0x8);
@@ -1509,7 +1515,7 @@ void drawCurrentFollowerOut()
15091515
uint8_t Alpha = 0xFF;
15101516
uint32_t Color = 0xFFFFFFFF;
15111517
int32_t PosX = -232;
1512-
int32_t PosY = 100;
1518+
int32_t PosY = 120;
15131519
float Scale = 0.6;
15141520

15151521
drawText(tempDisplayBuffer, PosX, PosY, Alpha, Color, Scale);
@@ -1525,13 +1531,13 @@ void drawMemoryWatches()
15251531

15261532
uint32_t tempCurrentPage = CurrentPage;
15271533
int32_t TotalMenuOptions = sizeof(MemoryWatch) / sizeof(MemoryWatch[0]);
1528-
int32_t MaxOptionsPerPage = 9;
1534+
int32_t MaxOptionsPerPage = 10;
15291535
int32_t IndexStart = tempCurrentPage * MaxOptionsPerPage;
15301536

15311537
uint32_t Color = 0xFFFFFFFF;
15321538
uint8_t Alpha = 0xFF;
15331539
int32_t PosX = -232;
1534-
int32_t PosY = 60;
1540+
int32_t PosY = 80;
15351541
float Scale = 0.6;
15361542

15371543
const int32_t TypeOffset = 150;
@@ -1610,7 +1616,7 @@ void drawMemoryModifyList()
16101616
}
16111617
else
16121618
{
1613-
CurrentOptionCheck = tempSelectedOption == i;
1619+
CurrentOptionCheck = (tempSelectedOption - 1) == i;
16141620
}
16151621

16161622
Color = getSelectedTextColor(CurrentOptionCheck);
@@ -1622,7 +1628,7 @@ void drawMemoryModifyList()
16221628
Color = 0xFFFFFFFF;
16231629

16241630
// Draw the value for the text
1625-
switch (i)
1631+
switch (i + 1)
16261632
{
16271633
case CHANGE_ADDRESS:
16281634
{
@@ -1788,7 +1794,7 @@ void drawMemoryChangeAddressList()
17881794

17891795
uint8_t Alpha = 0xFF;
17901796
int32_t PosX = -232;
1791-
int32_t PosY = 80;
1797+
int32_t PosY = 100;
17921798
float Scale = 0.6;
17931799
uint32_t Color;
17941800

@@ -1878,12 +1884,12 @@ void drawBattlesActorsList()
18781884
{
18791885
uint32_t tempCurrentPage = CurrentPage;
18801886
uint32_t TotalMenuOptions = 62; // Excluding System
1881-
uint32_t MaxOptionsPerPage = 13;
1887+
uint32_t MaxOptionsPerPage = 14;
18821888
uint32_t IndexStart = tempCurrentPage * MaxOptionsPerPage;
18831889

18841890
uint8_t Alpha = 0xFF;
18851891
int32_t PosX = -232;
1886-
int32_t PosY = 120;
1892+
int32_t PosY = 140;
18871893
float Scale = 0.6;
18881894
uint32_t Color;
18891895

@@ -2337,7 +2343,7 @@ void drawAdjustableValue(bool changingItem, uint32_t currentMenu)
23372343
}
23382344
else if (currentMenu == WARPS_INDEX)
23392345
{
2340-
if (tempCurrentMenuOption == INDEX_SELECT_MAP)
2346+
if ((tempCurrentMenuOption + 1) == INDEX_SELECT_MAP)
23412347
{
23422348
height = 212;
23432349
}
@@ -2435,7 +2441,7 @@ void drawAdjustableValue(bool changingItem, uint32_t currentMenu)
24352441
y -= 60;
24362442
}
24372443
else if ((currentMenu == WARPS_INDEX) &&
2438-
(tempCurrentMenuOption == INDEX_SELECT_MAP))
2444+
((tempCurrentMenuOption + 1) == INDEX_SELECT_MAP))
24392445
{
24402446
sprintf(tempDisplayBuffer,
24412447
"Map: %s",
@@ -2928,7 +2934,7 @@ void drawCheatsChangeSequence()
29282934
uint32_t Color = 0xFFFFFFFF;
29292935
uint8_t Alpha = 0xFF;
29302936
int32_t PosX = -232;
2931-
int32_t PosY = 120;
2937+
int32_t PosY = 140;
29322938
float Scale = 0.6;
29332939

29342940
uint32_t SequencePosition = getSequencePosition();
@@ -2973,7 +2979,7 @@ void drawCheatsBool(int32_t posY)
29732979
uint32_t tempMenuSelectedOption = MenuSelectedOption;
29742980

29752981
bool CheatActive = Cheat[tempMenuSelectedOption].Active;
2976-
const char *CurrentLine = CheatsLines[tempMenuSelectedOption + 1];
2982+
const char *CurrentLine = CheatsLines[tempMenuSelectedOption];
29772983

29782984
drawBoolOnOrOff(CheatActive, CurrentLine, posY);
29792985
}
@@ -3099,7 +3105,7 @@ void drawCheatsForcedDropItem()
30993105
uint8_t Alpha = 0xFF;
31003106
uint32_t Color = 0xFFFFFFFF;
31013107
int32_t PosX = -232;
3102-
int32_t PosY = 10;
3108+
int32_t PosY = 60;
31033109
float Scale = 0.6;
31043110

31053111
// Draw the text for showing what the current item is
@@ -3143,7 +3149,7 @@ void drawCheatsManageFlagsMain(uint32_t currentMenu)
31433149
{
31443150
ChangingWord = true;
31453151
Line = CheatsManageGlobalWordsOptions;
3146-
Size = 4;
3152+
Size = 3;
31473153
break;
31483154
}
31493155
case SET_GSWF:
@@ -3152,7 +3158,7 @@ void drawCheatsManageFlagsMain(uint32_t currentMenu)
31523158
default:
31533159
{
31543160
Line = CheatsManageGlobalFlagsOptions;
3155-
Size = 3;
3161+
Size = 2;
31563162
}
31573163
}
31583164

@@ -3209,18 +3215,18 @@ void drawCheatsManageFlagsMain(uint32_t currentMenu)
32093215
for (uint32_t i = 0; i < Size; i++)
32103216
{
32113217
bool CurrentOptionCheck;
3212-
if (tempSelectedOption == 0)
3218+
if (tempSelectedOption <= 1)
32133219
{
32143220
CurrentOptionCheck = CurrentMenuOption == i;
32153221
}
32163222
else
32173223
{
3218-
CurrentOptionCheck = tempSelectedOption == i;
3224+
CurrentOptionCheck = (tempSelectedOption - 1) == i;
32193225
}
32203226

32213227
Color = getSelectedTextColor(CurrentOptionCheck);
32223228

3223-
if (i == 1)
3229+
if (i == 0)
32243230
{
32253231
sprintf(tempDisplayBuffer,
32263232
"Change %s",
@@ -3292,7 +3298,7 @@ void drawCheatsClearArea()
32923298
const char **tempCheatsForceItemDropAreas = CheatsForceItemDropAreas;
32933299

32943300
int32_t PosX = -232;
3295-
int32_t PosY = 100;
3301+
int32_t PosY = 120;
32963302
uint32_t Size = tempCheatsForceItemDropAreasSize;
32973303
uint32_t MaxOptionsPerPage = tempCheatsForceItemDropAreasSize;
32983304
uint32_t MaxOptionsPerRow = 4;
@@ -3337,7 +3343,7 @@ void drawWarpsOptions()
33373343
const char **tempWarpDestinations = WarpDestinations;
33383344

33393345
int32_t PosX = -232;
3340-
int32_t PosY = 100;
3346+
int32_t PosY = 120;
33413347
uint32_t Size = tempWarpDestinationsSize;
33423348
uint32_t MaxOptionsPerPage = tempWarpDestinationsSize;
33433349
uint32_t MaxOptionsPerRow = 4;
@@ -3373,7 +3379,7 @@ void drawWarpIndexMapAndEntrance()
33733379
uint32_t Color = 0xFFFFFFFF;
33743380
uint8_t Alpha = 0xFF;
33753381
int32_t PosX = -232;
3376-
int32_t PosY = 60;
3382+
int32_t PosY = 80;
33773383
float Scale = 0.6;
33783384

33793385
const char *String = "Current Map\nCurrent Entrance\n\nNew Map\nNew Entrance Id";
@@ -3479,7 +3485,7 @@ void drawWarpIndexEntranceList()
34793485

34803486
void drawOnScreenTimerButtonCombos()
34813487
{
3482-
int32_t PosY = -20;
3488+
int32_t PosY = 0;
34833489
uint32_t tempOnScreenTimerOptionsSize = OnScreenTimerOptionsSize;
34843490

34853491
for (uint32_t i = 0; i < tempOnScreenTimerOptionsSize; i++)

0 commit comments

Comments
 (0)