Adjusted several nested counter increments

Author: Zephiles

ttyd-tools/rel/source/draw.cpp

@@ -1974,19 +1974,18 @@ void drawBattlesStatusesList()
 
 	// Get the initial address offset
 	uint32_t DisplayValueCounter = 0;
-	if (IndexStart >= 1) // Sleep flags
+	
+	if (IndexStart >= 20) // Explosion turns left
+	{
+		DisplayValueCounter += 3;
+	}
+	else if (IndexStart >= 18) // Can't use items
+	{
+		DisplayValueCounter += 2;
+	}
+	else if (IndexStart >= 1) // Sleep flags
 	{
 		DisplayValueCounter++;
-		
-		if (IndexStart >= 18) // Can't use items
-		{
-			DisplayValueCounter++;
-			
-			if (IndexStart >= 20) // Explosion turns left
-			{
-				DisplayValueCounter++;
-			}
-		}
 	}
 
 	// Draw the text and icons

ttyd-tools/rel/source/menu.cpp

@@ -2562,19 +2562,17 @@ void menuCheckButton()
 							}
 
 							uint32_t Counter = 0;
-							if (tempCurrentMenuOption >= 1) // Sleep flags
+							if (tempCurrentMenuOption >= 20) // Explosion turns left
+							{
+								Counter += 3;
+							}
+							else if (tempCurrentMenuOption >= 18) // Can't use items
+							{
+								Counter += 2;
+							}
+							else if (tempCurrentMenuOption >= 1) // Sleep flags
 							{
 								Counter++;
-								
-								if (tempCurrentMenuOption >= 18) // Can't use items
-								{
-									Counter++;
-									
-									if (tempCurrentMenuOption >= 20) // Explosion turns left
-									{
-										Counter++;
-									}
-								}
 							}
 
 							uint32_t TotalOptions = BattlesStatusesLinesSize;

ttyd-tools/rel/source/menufunctions.cpp

@@ -2958,24 +2958,21 @@ const char *getMapFromIndex(int32_t index)
 		int32_t NewIndex = index - 1;
 		uint32_t Counter = 0;
 
-		if (NewIndex >= 74) // gon_bt00
+		if (NewIndex >= 269) // dig_00
+		{
+			Counter += 32;
+		}
+		else if (NewIndex >= 266) // qiz_00
+		{
+			Counter += 24;
+		}
+		else if (NewIndex >= 90) // hei_bt00
+		{
+			Counter += 16;
+		}
+		else if (NewIndex >= 74) // gon_bt00
 		{
 			Counter += 8;
-			
-			if (NewIndex >= 90) // hei_bt00
-			{
-				Counter += 8;
-				
-				if (NewIndex >= 266) // qiz_00
-				{
-					Counter += 8;
-					
-					if (NewIndex >= 269) // dig_00
-					{
-						Counter += 8;
-					}
-				}
-			}
 		}
 
 		uint32_t WorldDataPointer = reinterpret_cast<uint32_t>(ttyd::mapdata::worldData.unk_18);