From 59cd3ecf1fbc56a7b36f2165415d2c1fb16f44f1 Mon Sep 17 00:00:00 2001
From: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Fri, 21 Jun 2024 21:23:50 +0200
Subject: [PATCH] fixed summary name lengths

---
 graphics/summary_screen/page_skills.bin | Bin 1280 -> 1280 bytes
 include/config/debug.h                  |   2 +-
 include/constants/global.h              |   2 +-
 src/pokemon_summary_screen.c            |  10 +++++-----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/graphics/summary_screen/page_skills.bin b/graphics/summary_screen/page_skills.bin
index 9284c1ba8058fcb062b855dde707f36f76efa4f5..a55a88ddcb0101a523dfc1a7b89ec88dcfdd269a 100644
GIT binary patch
delta 95
zcmZqRYT(-7#LT_PaI@hS!>xwf40lX!WRaen!7Rmj$ndb?5yPW~$0qkPOHN+E%rbce
xvkK#Mu>1?4{3FB1hEEKi8a|uM&muZmfklb)li_E>FNR+YzfJZBiX^Zs0066xBxe8s

delta 95
zcmV~$xe<a;6hP775s~~cWo+WcWOhJDwBWo#KyXXhe;c3zDIiGbIiVZ6@kz{ugp?~c
w?mT#EAefAtf|81w2CHZB)yh#v@k~p{i#H#721Y$Nn2DK%FDn~Ab`6~94{22@E&u=k

diff --git a/include/config/debug.h b/include/config/debug.h
index f5e1b55fb..da4ddabca 100644
--- a/include/config/debug.h
+++ b/include/config/debug.h
@@ -2,7 +2,7 @@
 #define GUARD_CONFIG_DEBUG_H
 
 // Overworld Debug
-#define DEBUG_OVERWORLD_MENU            FALSE                // Enables an overworld debug menu to change flags, variables, giving pokemon and more, accessed by holding R and pressing START while in the overworld by default.
+#define DEBUG_OVERWORLD_MENU            TRUE                // Enables an overworld debug menu to change flags, variables, giving pokemon and more, accessed by holding R and pressing START while in the overworld by default.
 #define DEBUG_OVERWORLD_HELD_KEYS       (R_BUTTON)          // The keys required to be held to open the debug menu.
 #define DEBUG_OVERWORLD_TRIGGER_EVENT   pressedStartButton  // The event that opens the menu when holding the key(s) defined in DEBUG_OVERWORLD_HELD_KEYS.
 #define DEBUG_OVERWORLD_IN_MENU         FALSE               // Replaces the overworld debug menu button combination with a start menu entry (above Pokédex).
diff --git a/include/constants/global.h b/include/constants/global.h
index a2580c6ec..8d58ad902 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -71,7 +71,7 @@
 #define PLAYER_NAME_LENGTH   7
 #define MAIL_WORDS_COUNT 9
 #define EASY_CHAT_BATTLE_WORDS_COUNT 6
-#define MOVE_NAME_LENGTH 12
+#define MOVE_NAME_LENGTH ((B_EXPANDED_MOVE_NAMES == TRUE) ? 16 : 12)
 #define NUM_QUESTIONNAIRE_WORDS 4
 #define WONDER_CARD_TEXT_LENGTH 40
 #define WONDER_NEWS_TEXT_LENGTH 40
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 0329ab967..9f319345f 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -184,7 +184,7 @@ struct PokemonSummaryScreenData
         u8 ALIGNED(4) expPointsStrBuf[9];
         u8 ALIGNED(4) expToNextLevelStrBuf[9];
 
-        u8 ALIGNED(4) abilityNameStrBuf[ABILITY_NAME_LENGTH];
+        u8 ALIGNED(4) abilityNameStrBuf[ABILITY_NAME_LENGTH + 1];
         u8 ALIGNED(4) abilityDescStrBuf[52];
     } summary;
 
@@ -2715,7 +2715,7 @@ static void PokeSum_PrintMoveName(u8 i)
     if (i == 4)
         curPP = maxPP;
 
-    AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 3, GetMoveNamePrinterYpos(i), sPrintMoveTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveNameStrBufs[i]);
+    AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 0, GetMoveNamePrinterYpos(i), sPrintMoveTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveNameStrBufs[i]);
 
     if (sMonSummaryScreen->moveIds[i] == 0 || (curPP == maxPP))
       colorIdx = 0;
@@ -3017,12 +3017,12 @@ static void PokeSum_PrintTrainerMemo_Egg(void)
 static void PokeSum_PrintExpPoints_NextLv(void)
 {
     AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_NORMAL,
-                                 26, 7,
+                                 9, 7,
                                  sLevelNickTextColors[0], TEXT_SKIP_DRAW,
                                  gText_PokeSum_ExpPoints);
 
     AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_NORMAL,
-                                 26, 20,
+                                 9, 20,
                                  sLevelNickTextColors[0], TEXT_SKIP_DRAW,
                                  gText_PokeSum_NextLv);
 }
@@ -3075,7 +3075,7 @@ static void PokeSum_PrintAbilityNameAndDesc(void)
     FillWindowPixelBuffer(sMonSummaryScreen->windowIds[5], 0);
 
     AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[5], FONT_NORMAL,
-                                 66, 1, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.abilityNameStrBuf);
+                                 49, 1, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.abilityNameStrBuf);
 
     AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[5], FONT_NORMAL,
                                  2, 15, sLevelNickTextColors[0], TEXT_SKIP_DRAW,