Stats - Added an option to change Yoshi's name

Also cleaned up some of the Stat's menu code revolving around the partners, as well as a few other stuff.

Author: Zephiles

ttyd-tools/rel/include/draw.h

@@ -59,6 +59,8 @@ void drawMultipleColumnsVertical(int32_t posX, int32_t posY, uint32_t currentMen
         uint32_t maxOptionsPerRow, bool showCurrentOption, 
             uint32_t posXIncrementAmount, const char **lines);
 
+bool setCustomText(char *textOut, uint32_t textSize);
+
 void drawInventoryIconAndTextColumns();
 
 void drawItemIconsColumn(uint32_t indexStart, uint32_t indexIncrement, uint32_t size, 

ttyd-tools/rel/include/global.h

@@ -1,12 +1,16 @@
 #pragma once
 
+#include "commonfunctions.h"
+
 #include <gc/OSAlloc.h>
 #include <gc/pad.h>
 #include <gc/DEMOPad.h>
 #include <ttyd/item_data.h>
 #include <ttyd/mapdata.h>
+#include <ttyd/msgdrv.h>
 
 #include <cstdint>
+#include <cstring>
 
 namespace mod {
 
@@ -240,6 +244,7 @@ enum CHEATS_CLEAR_AREA_FLAGS_AREAS
 #define ADDING_BY_ICON                     0x2108
 #define SPAWN_ITEM_MENU_VALUE              0x3000
 #define STATS_PARTNER_DISPLAY_YOSHI_COLORS 100
+#define STATS_PARTNER_DISPLAY_YOSHI_NAME   101
 
 enum STATS_MARIO_SELECTION_OPTIONS
 {
@@ -268,6 +273,8 @@ enum STATS_PARTNER_SELECTION_OPTIONS
     PARTNER_MAX_HP,
     PARTNER_RANK,
     TOGGLE,
+    CHANGE_YOSHI_COLOR,
+    CHANGE_YOSHI_NAME,
 };
 
 enum STATS_FOLLOWER_SELECTION_OPTIONS
@@ -595,8 +602,8 @@ struct MenuVars
 
     MenuVars()
     {
-        ForcedNPCItemDrop = ttyd::item_data::Item::SleepySheep;
         LagSpikeDuration  = 468;
+        ForcedNPCItemDrop = ttyd::item_data::Item::SleepySheep;
     }
 };
 
@@ -1103,6 +1110,69 @@ struct UnusedMapStruct
     }
 };
 
+struct SetCustomText
+{
+    #define CUSTOM_TEXT_BUFFER_SIZE 32
+    #define CUSTOM_TEXT_TOTAL_CHARS_ROWS 5
+    #define CUSTOM_TEXT_CANCEL 0x1100
+    #define CUSTOM_TEXT_DONE 0x1200
+    
+    char *Buffer;
+    const char *CharsToChooseFrom;
+    uint8_t CharsLength;
+    uint8_t CurrentIndex;
+    uint8_t CharsPerRow;
+    
+    SetCustomText()
+    {
+        Buffer = new char[CUSTOM_TEXT_BUFFER_SIZE];
+        CharsToChooseFrom = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890/. ";
+        CharsLength = static_cast<uint8_t>(strlen(CharsToChooseFrom));
+        CharsPerRow = 1 + ((CharsLength - 1) / CUSTOM_TEXT_TOTAL_CHARS_ROWS); // Round up
+    }
+    
+    void customTextInit(const char *initialText, uint32_t maxTextSize)
+    {
+        char *tempBuffer = reinterpret_cast<char *>(
+            clearMemory(Buffer, CUSTOM_TEXT_BUFFER_SIZE));
+        
+        if (initialText)
+        {
+#ifdef TTYD_JP
+            // Custom text doesn't currently support Japanese characters
+            if (ttyd::msgdrv::_ismbblead(initialText[0]))
+            {
+                // Text starts with a Japanese character
+                CurrentIndex = 0;
+            }
+            else
+            {
+#endif
+                uint32_t MaxIndex = maxTextSize - 1;
+                if (MaxIndex > (CUSTOM_TEXT_BUFFER_SIZE - 1))
+                {
+                    MaxIndex = (CUSTOM_TEXT_BUFFER_SIZE - 1);
+                }
+                
+                uint32_t Length = strlen(initialText);
+                if (Length > MaxIndex)
+                {
+                    Length = MaxIndex;
+                }
+                
+                CurrentIndex = static_cast<uint8_t>(Length);
+                strncpy(tempBuffer, initialText, Length);
+#ifdef TTYD_JP
+            }
+#endif
+        }
+        else
+        {
+            CurrentIndex = 0;
+        }
+    }
+};
+
 extern MenuVars MenuVar;
 extern Menus Menu[38];
 extern Cheats Cheat[28];
@@ -1141,6 +1211,7 @@ extern NpcNameToPtrErrorStruct NpcNameToPtrError;
 extern EnemyEncounterNotifierStruct EnemyEncounterNotifier;
 extern FrameAdvanceStruct FrameAdvance;
 extern UnusedMapStruct UnusedMap;
+extern SetCustomText CustomText;
 
 extern uint8_t CheatsOrder[];
 extern uint16_t StatsMarioIcons[];

ttyd-tools/rel/include/lst/ttyd.eu.lst

@@ -750,7 +750,7 @@
 // 80082944:msgWindow_Entry
 // 80082CD8:msgIconStr2ID
 // 80082D5C:msgGetCommand
-// 80082DFC:_ismbblead
+80082DFC:_ismbblead
 80082E48:msgSearch
 // 80082F28:msg_compare
 // 80082F70:L_msgGetWork
@@ -965,8 +965,8 @@
 800BFEE8:partyGetPtr
 
 // mario_pouch.o
-// 800D3BAC:pouchGetYoshiName
-// 800D3BF4:pouchSetYoshiName
+800D3BAC:pouchGetYoshiName
+800D3BF4:pouchSetYoshiName
 800D3C20:pouchSetPartyColor
 800D3C3C:pouchGetPartyColor
 // 800D3C50:pouchCheckMail

ttyd-tools/rel/include/lst/ttyd.jp.lst

@@ -750,7 +750,7 @@
 // 80080B04:msgWindow_Entry
 // 80080E70:msgIconStr2ID
 // 80080EF4:msgGetCommand
-// 80080F94:_ismbblead
+80080F94:_ismbblead
 80080FC8:msgSearch
 // 800810A8:msg_compare
 // 800810F0:L_msgGetWork
@@ -965,8 +965,8 @@
 800BCE30:partyGetPtr
 
 // mario_pouch.o
-// 800CEC68:pouchGetYoshiName
-// 800CECB0:pouchSetYoshiName
+800CEC68:pouchGetYoshiName
+800CECB0:pouchSetYoshiName
 800CECDC:pouchSetPartyColor
 800CECF8:pouchGetPartyColor
 // 800CED0C:pouchCheckMail

ttyd-tools/rel/include/lst/ttyd.us.lst

@@ -750,7 +750,7 @@
 // 80081688:msgWindow_Entry
 // 80081A1C:msgIconStr2ID
 // 80081AA0:msgGetCommand
-// 80081B40:_ismbblead
+80081B40:_ismbblead
 80081B8C:msgSearch
 // 80081C6C:msg_compare
 // 80081CB4:L_msgGetWork
@@ -964,8 +964,8 @@
 800BF1B4:partyGetPtr
 
 // mario_pouch.o
-// 800D2DB4:pouchGetYoshiName
-// 800D2DFC:pouchSetYoshiName
+800D2DB4:pouchGetYoshiName
+800D2DFC:pouchSetYoshiName
 800D2E28:pouchSetPartyColor
 800D2E44:pouchGetPartyColor
 // 800D2E58:pouchCheckMail

ttyd-tools/rel/include/menufunctions.h

@@ -49,6 +49,8 @@ uint32_t marioSpecialMovesButtonControls();
 uint32_t partnerChangeYoshiColorButtonControls();
 uint32_t followersOptionsButtonControls();
 
+uint32_t setCustomTextButtonControls(char *textOut, uint32_t textSize);
+
 void adjustMenuItemBoundsMain(int32_t valueChangedBy, int32_t lowerBound, int32_t upperBound);
 void adjustMenuItemBoundsMainUnsigned(int32_t valueChangedBy, uint32_t lowerBound, uint32_t upperBound);
 void adjustMenuItemBounds(int32_t valueChangedBy, uint32_t currentMenu);

ttyd-tools/rel/include/ttyd/mario_pouch.h

@@ -6,8 +6,8 @@ namespace ttyd::mario_pouch {
 
 extern "C" {
 
-// pouchGetYoshiName
-// pouchSetYoshiName
+const char *pouchGetYoshiName();
+void pouchSetYoshiName(const char *name);
 void pouchSetPartyColor(uint32_t partnerId, uint32_t colorId);
 uint32_t pouchGetPartyColor(uint32_t partnerId);
 // pouchCheckMail

ttyd-tools/rel/include/ttyd/msgdrv.h

@@ -19,7 +19,7 @@ extern "C" {
 // msgWindow_Entry
 // msgIconStr2ID
 // msgGetCommand
-// _ismbblead
+bool _ismbblead(const char chr); // Checks if chr is the start of a Japanese character
 const char *msgSearch(const char *key);
 // msg_compare
 // L_msgGetWork