Custom States - Add option to overwrite states

Author: Zephiles

ttyd-tools/rel/include/global.h

@@ -245,15 +245,17 @@ enum CHEATS_MANAGE_CUSTOM_STATES_SELECTION
     LOAD_CUSTOM_STATE = 1,
     CREATE_CUSTOM_STATE,
     DELETE_CUSTOM_STATE,
+    OVERWRITE_CUSTOM_STATE,
     RENAME_CUSTOM_STATE,
 };
 
 enum CHEATS_MANAGE_CUSTOM_STATES_RETURN_VALUES
 {
-    NO_STATES_EXIST = -4,
+    NO_STATES_EXIST = -5,
     MAX_STATES_EXIST,
     STATES_CREATE_NOT_IN_GAME,
     STATES_WARP_NOT_IN_GAME,
+    SUCCESSFULLY_OVERWROTE_STATE,
 };
 
 // Various menu values

ttyd-tools/rel/include/menufunctions.h

@@ -116,6 +116,7 @@ int32_t convertDoubleToString(char *strOut, int32_t totalLength, int32_t decimal
 float *getMarioCoordinateFromIndex(int32_t index);
 
 CustomStateStruct *resizeStateMemory(CustomStateStruct *state, uint32_t numEntries, int32_t incrementAmount);
+void setCustomStateData(CustomStateStruct *state);
 char *createCustomState();
 uint32_t deleteCustomState(uint32_t stateIndex);
 

ttyd-tools/rel/source/draw.cpp

@@ -4569,7 +4569,7 @@ void drawCheatsManageCustomStates()
         static_cast<int32_t>(TotalEntries), 
         CUSTOM_STATES_MAX_COUNT);
 
-    drawText(tempDisplayBuffer, -232, PosY - 100, Color, Scale);
+    drawText(tempDisplayBuffer, -232, PosY - 120, Color, Scale);
 
     // If no custom states currently exist, then exit
     if (TotalEntries == 0)

ttyd-tools/rel/source/global.cpp

@@ -1131,6 +1131,7 @@ const char *CheatsManageCustomStatesOptions[]
     "Load State",
     "Create State",
     "Delete State",
+    "Overwrite State",
     "Rename State",
 };
 

ttyd-tools/rel/source/menu.cpp

@@ -1566,6 +1566,7 @@ void menuCheckButton()
                         }
                         case LOAD_CUSTOM_STATE:
                         case DELETE_CUSTOM_STATE:
+                        case OVERWRITE_CUSTOM_STATE:
                         case RENAME_CUSTOM_STATE:
                         {
                             adjustCustomStatesSelection(CurrentButton);
@@ -1601,10 +1602,11 @@ void menuCheckButton()
                                         break;
                                     }
 
-                                    // Use the delete and rename code if didn't break
+                                    // Use the delete, overwrite, and rename code if didn't break
                                     [[fallthrough]];
                                 }
                                 case DELETE_CUSTOM_STATE:
+                                case OVERWRITE_CUSTOM_STATE:
                                 case RENAME_CUSTOM_STATE:
                                 {
                                     if (tempTotalEntries > 0)
@@ -1694,6 +1696,15 @@ void menuCheckButton()
                             }
                             break;
                         }
+                        case OVERWRITE_CUSTOM_STATE:
+                        {
+                            setCustomStateData(&CustomState.State[tempCurrentMenuOption]);
+                            closeSecondaryMenu();
+                            
+                            MenuVar.FunctionReturnCode = SUCCESSFULLY_OVERWROTE_STATE;
+                            MenuVar.Timer              = secondsToFrames(3);
+                            break;
+                        }
                         case RENAME_CUSTOM_STATE:
                         {
                             if (tempMenuSelectedOption == 0)
@@ -4430,9 +4441,8 @@ void drawMenu()
                 case NO_STATES_EXIST:
                 {
                     const char *CurrentLine = "No custom states currently exist.";
-                    
                     int32_t TextPosX = -138;
-                    int32_t TextPosY = 20;
+                    int32_t TextPosY = 5;
 #ifdef TTYD_JP
                     TextPosX += 2;
 #endif
@@ -4443,7 +4453,7 @@ void drawMenu()
                 {
                     const char *CurrentLine = "The maximum amount of custom\nstates currently exist.";
                     int32_t TextPosX = -129;
-                    int32_t TextPosY = 20;
+                    int32_t TextPosY = 5;
 #ifdef TTYD_JP
                     TextPosX += 2;
 #endif
@@ -4455,7 +4465,7 @@ void drawMenu()
                     const char *CurrentLine = "To create a custom state, you must have\na file loaded and not be in a battle nor a\nscreen transition.";
 
                     int32_t TextPosX = -173;
-                    int32_t TextPosY = 20;
+                    int32_t TextPosY = 5;
 #ifdef TTYD_JP
                     TextPosX += 3;
 #endif
@@ -4464,10 +4474,21 @@ void drawMenu()
                 }
                 case STATES_WARP_NOT_IN_GAME:
                 {
-                    int32_t TextPosY = 20;
+                    int32_t TextPosY = 5;
                     drawWarpsErrorMessage(TextPosY);
                     break;
                 }
+                case SUCCESSFULLY_OVERWROTE_STATE:
+                {
+                    const char *CurrentLine = "The custom state was successfully overwritten.";
+                    int32_t TextPosX = -197;
+                    int32_t TextPosY = 5;
+#ifdef TTYD_JP
+                    TextPosX += 1;
+#endif
+                    drawErrorWindowAutoCheckForClose(CurrentLine, TextPosX, TextPosY);
+                    break;
+                }
                 default:
                 {
                     break;

ttyd-tools/rel/source/menufunctions.cpp

@@ -5380,77 +5380,43 @@ CustomStateStruct *resizeStateMemory(CustomStateStruct *state, uint32_t numEntri
     return state;
 }
 
-char *createCustomState()
+void setCustomStateData(CustomStateStruct *state)
 {
-    uint32_t tempTotalEntries = CustomState.TotalEntries;
-    CustomStateStruct *tempState = CustomState.State;
-    
-    if (tempTotalEntries == 0)
-    {
-        // No custom states exist, so create one
-        if (tempState)
-        {
-            delete[] (tempState);
-        }
-        
-        tempState = new CustomStateStruct;
-        CustomState.State = tempState;
-        
-        tempTotalEntries = 1;
-        CustomState.TotalEntries = tempTotalEntries;
-    }
-    else if (tempTotalEntries >= CUSTOM_STATES_MAX_COUNT)
-    {
-        // Maximum number of states have been made
-        return nullptr;
-    }
-    else
-    {
-        tempState = resizeStateMemory(tempState, tempTotalEntries, 1);
-        CustomState.State = tempState;
-        
-        tempTotalEntries++;
-        CustomState.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, 
+        state->StandardItems, 
         reinterpret_cast<void *>(PouchPtr + 0x192), 
-        sizeof(tempState->StandardItems));
+        sizeof(state->StandardItems));
 
     // Important items
     memcpy(
-        tempState->ImportantItems, 
+        state->ImportantItems, 
         reinterpret_cast<void *>(PouchPtr + 0xA0), 
-        sizeof(tempState->ImportantItems));
+        sizeof(state->ImportantItems));
 
     // Badges
     memcpy(
-        tempState->Badges, 
+        state->Badges, 
         reinterpret_cast<void *>(PouchPtr + 0x1FA), 
-        sizeof(tempState->Badges));
+        sizeof(state->Badges));
 
     // Equipped badges
     memcpy(
-        tempState->EquippedBadges, 
+        state->EquippedBadges, 
         reinterpret_cast<void *>(PouchPtr + 0x38A), 
-        sizeof(tempState->EquippedBadges));
+        sizeof(state->EquippedBadges));
 
     // Stored items
     memcpy(
-        tempState->StoredItems, 
+        state->StoredItems, 
         reinterpret_cast<void *>(PouchPtr + 0x1BA), 
-        sizeof(tempState->StoredItems));
+        sizeof(state->StoredItems));
 
     // Back up some of Mario's data
-    CustomStateMarioVars *MarioVars = &tempState->MarioVars;
+    CustomStateMarioVars *MarioVars = &state->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);
@@ -5469,49 +5435,86 @@ char *createCustomState()
 
     // Back up the partner data
     memcpy(
-        tempState->PartyData, 
+        state->PartyData, 
         reinterpret_cast<void *>(PouchPtr + sizeof(ttyd::mario_pouch::PouchPartyData)), 
-        sizeof(tempState->PartyData));
+        sizeof(state->PartyData));
 
     // Back up the sequence position
-    tempState->SequencePosition = getSequencePosition();
+    state->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];
+        state->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];
+        state->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;
+        state->MarioIsShip = true;
     }
     else
     {
-        tempState->MarioIsShip = false;
+        state->MarioIsShip = false;
     }
 
     // Back up the current map
     strncpy(
-        tempState->CurrentMap, 
+        state->CurrentMap, 
         ttyd::seq_mapchange::NextMap, 
-        sizeof(tempState->CurrentMap));
+        sizeof(state->CurrentMap));
 
     // Back up the current loading zone
     strncpy(
-        tempState->CurrentBero, 
+        state->CurrentBero, 
         ttyd::seq_mapchange::NextBero, 
-        sizeof(tempState->CurrentBero));
+        sizeof(state->CurrentBero));
+}
+
+char *createCustomState()
+{
+    uint32_t tempTotalEntries = CustomState.TotalEntries;
+    CustomStateStruct *tempState = CustomState.State;
+    
+    if (tempTotalEntries == 0)
+    {
+        // No custom states exist, so create one
+        if (tempState)
+        {
+            delete[] (tempState);
+        }
+        
+        tempState = new CustomStateStruct;
+        CustomState.State = tempState;
+        
+        tempTotalEntries = 1;
+        CustomState.TotalEntries = tempTotalEntries;
+    }
+    else if (tempTotalEntries >= CUSTOM_STATES_MAX_COUNT)
+    {
+        // Maximum number of states have been made
+        return nullptr;
+    }
+    else
+    {
+        tempState = resizeStateMemory(tempState, tempTotalEntries, 1);
+        CustomState.State = tempState;
+        
+        tempTotalEntries++;
+        CustomState.TotalEntries = tempTotalEntries;
+    }
+    
+    tempState = &tempState[tempTotalEntries - 1];
+    setCustomStateData(tempState);
 
     // Return a pointer to the new state's name
     return tempState->StateName;