Move struct functions out of structs to save memory

This saves memory because the struct pointer is no longer passed to these functions.

Also fixed the 2nd custom state text becoming blue when creating a new state.

Also made a small optimization in drawCheatsHandleCustomStateAction.

Author: Zephiles

ttyd-tools/rel/include/global.h

@@ -1056,13 +1056,6 @@ struct ManageCustomStates
     uint8_t TotalEntries;
     bool StateWasSelected;
     uint8_t SelectedState;
-    
-    // Do not inline resizeStateMemory, createCustomState, nor deleteCustomState
-    CustomStateStruct *resizeStateMemory(
-        CustomStateStruct *state, uint32_t numEntries, int32_t incrementAmount);
-    
-    char *createCustomState();
-    uint32_t deleteCustomState(uint32_t stateIndex);
 };
 
 struct CustomStateSettingsStruct
@@ -1223,9 +1216,6 @@ struct SetCustomText
             delete[] (Buffer);
         }
     }
-    
-    // Do not inline customTextInit
-    void customTextInit(const char *initialText, uint32_t maxTextSize);
 };
 
 extern MenuVars MenuVar;

ttyd-tools/rel/include/menufunctions.h

@@ -49,6 +49,7 @@ uint32_t marioSpecialMovesButtonControls();
 uint32_t partnerChangeYoshiColorButtonControls();
 uint32_t followersOptionsButtonControls();
 
+void customTextInit(const char *initialText, uint32_t maxTextSize);
 uint32_t setCustomTextButtonControls(char *textOut, uint32_t textSize, bool applyNullTerminator);
 
 void adjustMenuItemBoundsMain(int32_t valueChangedBy, int32_t lowerBound, int32_t upperBound);
@@ -114,6 +115,10 @@ bool cheatsManageTimer(uint32_t buttonInput);
 int32_t convertDoubleToString(char *strOut, int32_t totalLength, int32_t decimalCount, double value);
 float *getMarioCoordinateFromIndex(int32_t index);
 
+CustomStateStruct *resizeStateMemory(CustomStateStruct *state, uint32_t numEntries, int32_t incrementAmount);
+char *createCustomState();
+uint32_t deleteCustomState(uint32_t stateIndex);
+
 bool checkForDPADInput();
 uint32_t checkButtonSingleFrame();
 // void correctPageSingleColumn(uint32_t button, uint8_t &currentPage)

ttyd-tools/rel/source/commonfunctions.cpp

@@ -235,7 +235,7 @@ ttyd::memory::SmartAllocationData *allocFromSmartHeap(uint32_t size, uint32_t gr
     // Allocate the memory
     ttyd::memory::SmartAllocationData *SmartData = ttyd::memory::smartAlloc(size, group);
 
-    // Set up a temporary local variable to use for getting memory
+    // Set up a temporary local variable to use for getting the memory
     void *Ptr = SmartData->pMemory;
 
     // Clear the memory, as this is not done automatically

ttyd-tools/rel/source/draw.cpp

@@ -4605,7 +4605,10 @@ void drawCheatsManageCustomStates()
             break;
         }
 
-        bool CurrentOptionCheck = (tempSelectedOption != 0) && (tempCurrentMenuOption == i);
+        bool CurrentOptionCheck = (tempSelectedOption != 0) && 
+            (tempSelectedOption != CREATE_CUSTOM_STATE) && 
+            (tempCurrentMenuOption == i);
+        
         Color = getSelectedTextColor(CurrentOptionCheck);
 
         char *tempBuf = strncpy(
@@ -4633,25 +4636,24 @@ void drawCheatsHandleCustomStateAction()
                 // Make sure the player is currently in the game
                 if (checkIfInGame())
                 {
-                    char *NewStateName = CustomState.createCustomState();
+                    char *NewStateName = createCustomState();
                     if (NewStateName)
                     {
                         strncpy(NewStateName, NewName, NameSize);
-                        closeSecondaryMenu();
                     }
                     else // Failsafe; shouldn't ever run
                     {
-                        closeSecondaryMenu();
                         MenuVar.FunctionReturnCode = MAX_STATES_EXIST;
                         MenuVar.Timer              = secondsToFrames(3);
                     }
                 }
                 else
                 {
-                    closeSecondaryMenu();
                     MenuVar.FunctionReturnCode = STATES_CREATE_NOT_IN_GAME;
                     MenuVar.Timer              = secondsToFrames(3);
                 }
+                
+                closeSecondaryMenu();
                 break;
             }
             case RENAME_CUSTOM_STATE:

ttyd-tools/rel/source/global.cpp

@@ -1,13 +1,6 @@
 #include "global.h"
 #include "memcard.h"
 
-#include <ttyd/msgdrv.h>
-#include <ttyd/memory.h>
-#include <ttyd/mario_pouch.h>
-#include <ttyd/mario.h>
-#include <ttyd/mario_motion.h>
-#include <ttyd/seq_mapchange.h>
-
 #include <cstring>
 
 namespace mod {
@@ -2223,246 +2216,4 @@ void setInitialSettings()
     FrameCounter.ButtonCombo[RESET]               = PAD_L | PAD_DPAD_RIGHT;
 }
 
-void SetCustomText::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;
-    }
-}
-
-CustomStateStruct * ManageCustomStates::resizeStateMemory(
-    CustomStateStruct *state, uint32_t numEntries, int32_t incrementAmount)
-{
-    uint32_t CurrentStatesSize = sizeof(CustomStateStruct) * numEntries;
-    
-    // Allocate temporary memory to hold the states
-    // Allocate the memory on the smart heap to avoid fragmentation
-    ttyd::memory::SmartAllocationData *SmartData = 
-        allocFromSmartHeap(CurrentStatesSize, 
-            ttyd::memory::SmartAllocationGroup::kNone);
-    
-    // Set up a temporary local variable to use for getting the memory
-    CustomStateStruct *tempStateSmart = reinterpret_cast<CustomStateStruct *>(SmartData->pMemory);
-    
-    // Copy the states from the old memory to the temporary memory
-    memcpy(tempStateSmart, state, CurrentStatesSize);
-    
-    // Free the old memory
-    delete[] (state);
-    
-    // Allocate new memory to hold the states
-    state = new CustomStateStruct[numEntries + incrementAmount];
-    
-    // Copy the states from the temporary memory to the new memory
-    memcpy(state, tempStateSmart, CurrentStatesSize);
-    
-    // Free the temporary memory
-    ttyd::memory::smartFree(SmartData);
-    return state;
-}
-
-char *ManageCustomStates::createCustomState()
-{
-    uint32_t tempTotalEntries = TotalEntries;
-    CustomStateStruct *tempState = State;
-    
-    if (tempTotalEntries == 0)
-    {
-        // No custom states exist, so create one
-        if (tempState)
-        {
-            delete[] (tempState);
-        }
-        
-        tempState = new CustomStateStruct;
-        State = tempState;
-        
-        tempTotalEntries = 1;
-        TotalEntries = tempTotalEntries;
-    }
-    else if (tempTotalEntries >= CUSTOM_STATES_MAX_COUNT)
-    {
-        // Maximum number of states have been made
-        return nullptr;
-    }
-    else
-    {
-        tempState = resizeStateMemory(tempState, tempTotalEntries, 1);
-        State = tempState;
-        
-        tempTotalEntries++;
-        TotalEntries = tempTotalEntries;
-    }
-    
-    // Set the info for the new state
-    tempState = &tempState[tempTotalEntries - 1];
-    
-    // Back up the inventory
-    uint32_t PouchPtr = reinterpret_cast<uint32_t>(ttyd::mario_pouch::pouchGetPtr());
-    
-    // Standard items
-    memcpy(
-        tempState->StandardItems, 
-        reinterpret_cast<void *>(PouchPtr + 0x192), 
-        sizeof(tempState->StandardItems));
-    
-    // Important items
-    memcpy(
-        tempState->ImportantItems, 
-        reinterpret_cast<void *>(PouchPtr + 0xA0), 
-        sizeof(tempState->ImportantItems));
-    
-    // Badges
-    memcpy(
-        tempState->Badges, 
-        reinterpret_cast<void *>(PouchPtr + 0x1FA), 
-        sizeof(tempState->Badges));
-    
-    // Equipped badges
-    memcpy(
-        tempState->EquippedBadges, 
-        reinterpret_cast<void *>(PouchPtr + 0x38A), 
-        sizeof(tempState->EquippedBadges));
-    
-    // Stored items
-    memcpy(
-        tempState->StoredItems, 
-        reinterpret_cast<void *>(PouchPtr + 0x1BA), 
-        sizeof(tempState->StoredItems));
-    
-    // Back up some of Mario's data
-    CustomStateMarioVars *MarioVars = &tempState->MarioVars;
-    MarioVars->currentHP           = *reinterpret_cast<int16_t *>(PouchPtr + 0x70);
-    MarioVars->maxHP               = *reinterpret_cast<int16_t *>(PouchPtr + 0x72);
-    MarioVars->currentFP           = *reinterpret_cast<int16_t *>(PouchPtr + 0x74);
-    MarioVars->maxFP               = *reinterpret_cast<int16_t *>(PouchPtr + 0x76);
-    MarioVars->maxHPEnteringBattle = *reinterpret_cast<int16_t *>(PouchPtr + 0x8E);
-    MarioVars->maxFPEnteringBattle = *reinterpret_cast<int16_t *>(PouchPtr + 0x90);
-    MarioVars->currentSP           = *reinterpret_cast<int16_t *>(PouchPtr + 0x7A);
-    MarioVars->maxSP               = *reinterpret_cast<int16_t *>(PouchPtr + 0x7C);
-    MarioVars->availableBP         = *reinterpret_cast<int16_t *>(PouchPtr + 0x92);
-    MarioVars->maxBP               = *reinterpret_cast<int16_t *>(PouchPtr + 0x94);
-    MarioVars->rank                = *reinterpret_cast<int16_t *>(PouchPtr + 0x88);
-    MarioVars->level               = *reinterpret_cast<int16_t *>(PouchPtr + 0x8A);
-    MarioVars->starPowersObtained  = *reinterpret_cast<uint16_t *>(PouchPtr + 0x8C);
-    MarioVars->starPoints          = *reinterpret_cast<int16_t *>(PouchPtr + 0x96);
-    MarioVars->coins               = *reinterpret_cast<int16_t *>(PouchPtr + 0x78);
-    
-    // Back up the partner data
-    memcpy(
-        tempState->PartyData, 
-        reinterpret_cast<void *>(PouchPtr + sizeof(ttyd::mario_pouch::PouchPartyData)), 
-        sizeof(tempState->PartyData));
-    
-    // Back up the sequence position
-    tempState->SequencePosition = getSequencePosition();
-    
-    // Back up which partner is currently out
-    ttyd::mario::Player *player = ttyd::mario::marioGetPtr();
-    uint32_t PartnerPtr = reinterpret_cast<uint32_t>(getPartnerPointer());
-    if (PartnerPtr)
-    {
-        tempState->PartnerOut = player->prevFollowerId[0];
-    }
-    
-    // Back up which follower is currently out
-    uint32_t FollowerPtr = reinterpret_cast<uint32_t>(getFollowerPointer());
-    if (FollowerPtr)
-    {
-        tempState->FollowerOut = player->prevFollowerId[1];
-    }
-    
-    // Back up if Mario is currently using Boat Mode or not
-    if (player->currentMotionId == ttyd::mario_motion::MarioMotions::kShip)
-    {
-        tempState->MarioIsShip = true;
-    }
-    else
-    {
-        tempState->MarioIsShip = false;
-    }
-    
-    // Back up the current map
-    strncpy(
-        tempState->CurrentMap, 
-        ttyd::seq_mapchange::NextMap, 
-        sizeof(tempState->CurrentMap));
-    
-    // Back up the current loading zone
-    strncpy(
-        tempState->CurrentBero, 
-        ttyd::seq_mapchange::NextBero, 
-        sizeof(tempState->CurrentBero));
-    
-    // Return a pointer to the new state's name
-    return tempState->StateName;
-}
-
-uint32_t ManageCustomStates::deleteCustomState(uint32_t stateIndex)
-{
-    CustomStateStruct *tempState = State;
-    uint32_t tempTotalEntries = TotalEntries;
-    
-    // Decrement TotalEntries now since it'll be used several times in the following code
-    tempTotalEntries--;
-    TotalEntries = tempTotalEntries;
-    
-    // Check if there are other states left after deleting the selected one
-    if (tempTotalEntries > 0)
-    {
-        // If deleting the last entry, don't do any moving beforehand
-        if (stateIndex < tempTotalEntries)
-        {
-            // Move all of the states under the one being deleted up by one slot
-            uint32_t CopySize = sizeof(CustomStateStruct) * (tempTotalEntries - stateIndex);
-            memcpy(&tempState[stateIndex], &tempState[stateIndex + 1], CopySize);
-        }
-        
-        State = resizeStateMemory(tempState, tempTotalEntries, 0);
-    }
-    else
-    {
-        // There are no more states left
-        delete[] (tempState);
-        State = nullptr;
-    }
-    
-    // Return the total number of entries
-    return tempTotalEntries;
-}
-
 }

ttyd-tools/rel/source/menu.cpp

@@ -1626,7 +1626,7 @@ void menuCheckButton()
                                     {
                                         if (tempTotalEntries < CUSTOM_STATES_MAX_COUNT)
                                         {
-                                            CustomText.customTextInit(nullptr, 0);
+                                            customTextInit(nullptr, 0);
                                             MenuVar.SecondaryMenuOption = 0;
                                             MenuVar.MenuSelectedOption = CurrentMenuOptionCheck;
                                             MenuVar.SelectedOption = CurrentMenuOptionCheck;
@@ -1676,7 +1676,7 @@ void menuCheckButton()
                         }
                         case DELETE_CUSTOM_STATE:
                         {
-                            uint32_t TotalEntries = CustomState.deleteCustomState(tempCurrentMenuOption);
+                            uint32_t TotalEntries = deleteCustomState(tempCurrentMenuOption);
                             if (TotalEntries == 0)
                             {
                                 closeSecondaryMenu();
@@ -1704,7 +1704,7 @@ void menuCheckButton()
                                     sizeof(CustomState.State[tempCurrentMenuOption].StateName);
 
                                 // Add 1 to StateNameSize since it's not null terminated
-                                CustomText.customTextInit(StateName, StateNameSize + 1);
+                                customTextInit(StateName, StateNameSize + 1);
 
                                 MenuVar.SecondaryMenuOption = 0;
                                 MenuVar.MenuSelectedOption = tempSelectedOption;
@@ -1932,7 +1932,7 @@ void menuCheckButton()
                                                 HandledYoshiOption = true;
 
                                                 // char NewYoshiName[11]; // One byte for NULL
-                                                CustomText.customTextInit(ttyd::mario_pouch::pouchGetYoshiName(), 11);
+                                                customTextInit(ttyd::mario_pouch::pouchGetYoshiName(), 11);
 
                                                 MenuVar.MenuSelectedOption = STATS_PARTNER_DISPLAY_YOSHI_NAME;
                                                 MenuVar.SecondaryMenuOption = 0;