Merge pull request #473 from besteon/dev

8.6.0 Patch Release
besteon · Sep 13, 2024 · b945e7d · b945e7d
2 parents d6a1ac4 + 266bf81
commit b945e7d
Show file tree

Hide file tree

Showing 20 changed files with 456 additions and 19 deletions.
diff --git a/ironmon_tracker/Constants.lua b/ironmon_tracker/Constants.lua
@@ -114,6 +114,8 @@ Constants.OrderedLists = {
 		"CarouselSpeed",
 		"Auto swap to enemy",
 		"Show random ball picker",
+		"Show heals as whole number",
+		"Show Poke Ball catch rate",
 		"Hide stats until summary shown",
 		"Right justified numbers",
 		"Show nicknames",
@@ -692,6 +694,7 @@ Constants.Char = {
 	[">"] = { width = 4, },
 	["/"] = { width = 4, },
 	[":"] = { width = 1, },
+	["~"] = { width = 5, },
 	["a"] = { width = 4, },
 	["A"] = { width = 4, },
 	["b"] = { width = 4, },

diff --git a/ironmon_tracker/Languages/English.lua b/ironmon_tracker/Languages/English.lua
@@ -130,6 +130,7 @@ ScreenResources{
 		HeaderPP = "PP",
 		HeaderPow = "Pow",
 		HeaderAcc = "Acc",
+		ToCatch = "to catch",
 		LeaveANote = "Leave a note",
 		DamageTaken = "damage",
 		DamageTakenInTeams = "Total received",
@@ -235,6 +236,8 @@ ScreenResources{
 		ButtonEditTime = "Edit",
 		ButtonRelocateTime = "Relocate",
 		OptionShowRandomBallPicker = "Show random ball picker",
+		OptionShowHealsAsValue = "Show heals as whole number",
+		OptionShowBallCatchRate = "Show Poké Ball catch rate",
 		OptionDisplayRepelUsage = "Display repel usage",
 		OptionDisplayPedometer = "Display step pedometer",
 		OptionDisplayPlayTime = "Display play time",
@@ -634,6 +637,8 @@ ScreenResources{
 		CMD_Progress_Help = "> Displays fun progress percentages for the current game.",
 		CMD_Log_Name = "Log Randomizer Settings",
 		CMD_Log_Help = "> If the log has been opened, displays shareable randomizer settings from the log for current game.",
+		CMD_BallQueue_Name = "Ball Queue",
+		CMD_BallQueue_Help = "> Displays the size of the ball queue and the current pick, if any.",
 		CMD_About_Name = "About the Tracker",
 		CMD_About_Help = "> Displays info about the Ironmon Tracker and game being played.",
 		CMD_Help_Name = "Command Help",
@@ -653,6 +658,7 @@ ScreenResources{
 		O_WordForMiddle = "Word for Middle",
 		O_WordForRight = "Word for Right",
 		O_WordForRandom = "Word for Random",
+		O_ShowBallQueueOnStartup = "Show Ball Queue info on startup",
 		TabCommands = "Commands",
 		TabRewards = "Rewards",
 		TabQueue = "Queue",
@@ -711,6 +717,7 @@ ScreenResources{
 		MenuExtensions = "Extensions",
 		MenuCommands = "Commands",
 		MenuBasicCommands = "Basic Commands",
+		MenuAdvancedCommands = "Advanced Commands",
 		MenuOtherCommands = "Other Commands",
 		MenuInfoLookup = "Info Lookup",
 		MenuPokemon = "Pokémon",
@@ -755,6 +762,8 @@ ScreenResources{
 		OptionCountEnemyPP = "Count enemy PP usage",
 		OptionShowLastDamage = "Show last damage calcs",
 		OptionRevealRandomizedInfo = "Show random move/type data",
+		OptionShowHealsAsValue = "Show heals as whole number",
+		OptionShowBallCatchRate = "Show Poke Ball catch rate",
 		OptionAutodetectGameLanguage = "Autodetect game language",
 		OptionPremadeRoms = "Use premade ROMs",
 		OptionGenerateRom = "Generate a ROM each time",
@@ -851,6 +860,7 @@ ScreenResources{
 		TrackerSpAttack = "SPA",
 		TrackerSpDefense = "SPD",
 		TrackerSpeed = "SPE",
+		TrackerCatchRate = "Catch rate",
 		TrackerSurvivalPCs = "Survival PCs",
 		TrackerHeals = "Heals",
 		TrackerLastSeen = "Last seen",

diff --git a/ironmon_tracker/Languages/French.lua b/ironmon_tracker/Languages/French.lua
@@ -130,6 +130,7 @@ ScreenResources{
 		HeaderPP = "PP", -- NEEDS TRANSLATION
 		HeaderPow = "Pow", -- NEEDS TRANSLATION
 		HeaderAcc = "Acc", -- NEEDS TRANSLATION
+		ToCatch = "to catch", -- NEEDS TRANSLATION
 		LeaveANote = "Leave a note", -- NEEDS TRANSLATION
 		DamageTaken = "damage", -- NEEDS TRANSLATION
 		DamageTakenInTeams = "Total received", -- NEEDS TRANSLATION
@@ -235,6 +236,8 @@ ScreenResources{
 		ButtonEditTime = "Edit", -- NEEDS TRANSLATION
 		ButtonRelocateTime = "Relocate", -- NEEDS TRANSLATION
 		OptionShowRandomBallPicker = "Show random ball picker", -- NEEDS TRANSLATION
+		OptionShowHealsAsValue = "Show heals as whole number", -- NEEDS TRANSLATION
+		OptionShowBallCatchRate = "Show Poké Ball catch rate", -- NEEDS TRANSLATION
 		OptionDisplayRepelUsage = "Display repel usage", -- NEEDS TRANSLATION
 		OptionDisplayPedometer = "Display step pedometer", -- NEEDS TRANSLATION
 		OptionDisplayPlayTime = "Display play time", -- NEEDS TRANSLATION
@@ -635,6 +638,8 @@ ScreenResources{
 		CMD_Progress_Help = "> Displays fun progress percentages for the current game.",
 		CMD_Log_Name = "Log Randomizer Settings",
 		CMD_Log_Help = "> If the log has been opened, displays shareable randomizer settings from the log for current game.",
+		CMD_BallQueue_Name = "Ball Queue",
+		CMD_BallQueue_Help = "> Displays the size of the ball queue and the current pick, if any.",
 		CMD_About_Name = "About the Tracker",
 		CMD_About_Help = "> Displays info about the Ironmon Tracker and game being played.",
 		CMD_Help_Name = "Command Help",
@@ -654,6 +659,7 @@ ScreenResources{
 		O_WordForMiddle = "Word for Middle",
 		O_WordForRight = "Word for Right",
 		O_WordForRandom = "Word for Random",
+		O_ShowBallQueueOnStartup = "Show Ball Queue info on startup",
 		-- THE BELOW SCREEN LABELS NEED TRANSLATION
 		TabCommands = "Commands",
 		TabRewards = "Rewards",
@@ -713,6 +719,7 @@ ScreenResources{
 		MenuExtensions = "Extensions", -- NEEDS TRANSLATION
 		MenuCommands = "Commands", -- NEEDS TRANSLATION
 		MenuBasicCommands = "Basic Commands", -- NEEDS TRANSLATION
+		MenuAdvancedCommands = "Advanced Commands", -- NEEDS TRANSLATION
 		MenuOtherCommands = "Other Commands", -- NEEDS TRANSLATION
 		MenuInfoLookup = "Info Lookup", -- NEEDS TRANSLATION
 		MenuPokemon = "Pokémon", -- NEEDS TRANSLATION
@@ -757,6 +764,8 @@ ScreenResources{
 		OptionCountEnemyPP = "Count enemy PP usage", -- NEEDS TRANSLATION
 		OptionShowLastDamage = "Show last damage calcs", -- NEEDS TRANSLATION
 		OptionRevealRandomizedInfo = "Reveal info if randomized", -- NEEDS TRANSLATION
+		OptionShowHealsAsValue = "Show heals as whole number", -- NEEDS TRANSLATION
+		OptionShowBallCatchRate = "Show Poke Ball catch rate", -- NEEDS TRANSLATION
 		OptionAutodetectGameLanguage = "Autodetect game language", -- NEEDS TRANSLATION
 		OptionPremadeRoms = "Use premade ROMs", -- NEEDS TRANSLATION
 		OptionGenerateRom = "Generate a ROM each time", -- NEEDS TRANSLATION
@@ -852,6 +861,7 @@ ScreenResources{
 		TrackerSpAttack = "SPA", -- NEEDS TRANSLATION
 		TrackerSpDefense = "SPD", -- NEEDS TRANSLATION
 		TrackerSpeed = "SPE", -- NEEDS TRANSLATION
+		TrackerCatchRate = "Catch rate", -- NEEDS TRANSLATION
 		TrackerSurvivalPCs = "Survival PCs", -- NEEDS TRANSLATION
 		TrackerHeals = "Heals", -- NEEDS TRANSLATION
 		TrackerLastSeen = "Last seen", -- NEEDS TRANSLATION

diff --git a/ironmon_tracker/Languages/German.lua b/ironmon_tracker/Languages/German.lua
@@ -130,6 +130,7 @@ ScreenResources{
 		HeaderPP = "PP", -- NEEDS TRANSLATION
 		HeaderPow = "Pow", -- NEEDS TRANSLATION
 		HeaderAcc = "Acc", -- NEEDS TRANSLATION
+		ToCatch = "to catch", -- NEEDS TRANSLATION
 		LeaveANote = "Leave a note", -- NEEDS TRANSLATION
 		DamageTaken = "damage", -- NEEDS TRANSLATION
 		DamageTakenInTeams = "Total received", -- NEEDS TRANSLATION
@@ -235,6 +236,8 @@ ScreenResources{
 		ButtonEditTime = "Edit", -- NEEDS TRANSLATION
 		ButtonRelocateTime = "Relocate", -- NEEDS TRANSLATION
 		OptionShowRandomBallPicker = "Show random ball picker", -- NEEDS TRANSLATION
+		OptionShowHealsAsValue = "Show heals as whole number", -- NEEDS TRANSLATION
+		OptionShowBallCatchRate = "Show Poké Ball catch rate", -- NEEDS TRANSLATION
 		OptionDisplayRepelUsage = "Display repel usage", -- NEEDS TRANSLATION
 		OptionDisplayPedometer = "Display step pedometer", -- NEEDS TRANSLATION
 		OptionDisplayPlayTime = "Display play time", -- NEEDS TRANSLATION
@@ -635,6 +638,8 @@ ScreenResources{
 		CMD_Progress_Help = "> Displays fun progress percentages for the current game.",
 		CMD_Log_Name = "Log Randomizer Settings",
 		CMD_Log_Help = "> If the log has been opened, displays shareable randomizer settings from the log for current game.",
+		CMD_BallQueue_Name = "Ball Queue",
+		CMD_BallQueue_Help = "> Displays the size of the ball queue and the current pick, if any.",
 		CMD_About_Name = "About the Tracker",
 		CMD_About_Help = "> Displays info about the Ironmon Tracker and game being played.",
 		CMD_Help_Name = "Command Help",
@@ -654,6 +659,7 @@ ScreenResources{
 		O_WordForMiddle = "Word for Middle",
 		O_WordForRight = "Word for Right",
 		O_WordForRandom = "Word for Random",
+		O_ShowBallQueueOnStartup = "Show Ball Queue info on startup",
 		-- THE BELOW SCREEN LABELS NEED TRANSLATION
 		TabCommands = "Commands",
 		TabRewards = "Rewards",
@@ -713,6 +719,7 @@ ScreenResources{
 		MenuExtensions = "Extensions", -- NEEDS TRANSLATION
 		MenuCommands = "Commands", -- NEEDS TRANSLATION
 		MenuBasicCommands = "Basic Commands", -- NEEDS TRANSLATION
+		MenuAdvancedCommands = "Advanced Commands", -- NEEDS TRANSLATION
 		MenuOtherCommands = "Other Commands", -- NEEDS TRANSLATION
 		MenuInfoLookup = "Info Lookup", -- NEEDS TRANSLATION
 		MenuPokemon = "Pokémon", -- NEEDS TRANSLATION
@@ -757,6 +764,8 @@ ScreenResources{
 		OptionCountEnemyPP = "Count enemy PP usage", -- NEEDS TRANSLATION
 		OptionShowLastDamage = "Show last damage calcs", -- NEEDS TRANSLATION
 		OptionRevealRandomizedInfo = "Show random move/type data", -- NEEDS TRANSLATION
+		OptionShowHealsAsValue = "Show heals as whole number", -- NEEDS TRANSLATION
+		OptionShowBallCatchRate = "Show Poke Ball catch rate", -- NEEDS TRANSLATION
 		OptionAutodetectGameLanguage = "Autodetect game language", -- NEEDS TRANSLATION
 		OptionPremadeRoms = "Use premade ROMs", -- NEEDS TRANSLATION
 		OptionGenerateRom = "Generate a ROM each time", -- NEEDS TRANSLATION
@@ -852,6 +861,7 @@ ScreenResources{
 		TrackerSpAttack = "SPA", -- NEEDS TRANSLATION
 		TrackerSpDefense = "SPD", -- NEEDS TRANSLATION
 		TrackerSpeed = "SPE", -- NEEDS TRANSLATION
+		TrackerCatchRate = "Catch rate", -- NEEDS TRANSLATION
 		TrackerSurvivalPCs = "Survival PCs", -- NEEDS TRANSLATION
 		TrackerHeals = "Heals", -- NEEDS TRANSLATION
 		TrackerLastSeen = "Last seen", -- NEEDS TRANSLATION

diff --git a/ironmon_tracker/Languages/Italian.lua b/ironmon_tracker/Languages/Italian.lua
@@ -130,6 +130,7 @@ ScreenResources{
 		HeaderPP = "PP", -- NEEDS TRANSLATION
 		HeaderPow = "Pow", -- NEEDS TRANSLATION
 		HeaderAcc = "Acc", -- NEEDS TRANSLATION
+		ToCatch = "to catch", -- NEEDS TRANSLATION
 		LeaveANote = "Leave a note", -- NEEDS TRANSLATION
 		DamageTaken = "damage", -- NEEDS TRANSLATION
 		DamageTakenInTeams = "Total received", -- NEEDS TRANSLATION
@@ -235,6 +236,8 @@ ScreenResources{
 		ButtonEditTime = "Edit", -- NEEDS TRANSLATION
 		ButtonRelocateTime = "Relocate", -- NEEDS TRANSLATION
 		OptionShowRandomBallPicker = "Show random ball picker", -- NEEDS TRANSLATION
+		OptionShowHealsAsValue = "Show heals as whole number", -- NEEDS TRANSLATION
+		OptionShowBallCatchRate = "Show Poké Ball catch rate", -- NEEDS TRANSLATION
 		OptionDisplayRepelUsage = "Display repel usage", -- NEEDS TRANSLATION
 		OptionDisplayPedometer = "Display step pedometer", -- NEEDS TRANSLATION
 		OptionDisplayPlayTime = "Display play time", -- NEEDS TRANSLATION
@@ -635,6 +638,8 @@ ScreenResources{
 		CMD_Progress_Help = "> Displays fun progress percentages for the current game.",
 		CMD_Log_Name = "Log Randomizer Settings",
 		CMD_Log_Help = "> If the log has been opened, displays shareable randomizer settings from the log for current game.",
+		CMD_BallQueue_Name = "Ball Queue",
+		CMD_BallQueue_Help = "> Displays the size of the ball queue and the current pick, if any.",
 		CMD_About_Name = "About the Tracker",
 		CMD_About_Help = "> Displays info about the Ironmon Tracker and game being played.",
 		CMD_Help_Name = "Command Help",
@@ -654,6 +659,7 @@ ScreenResources{
 		O_WordForMiddle = "Word for Middle",
 		O_WordForRight = "Word for Right",
 		O_WordForRandom = "Word for Random",
+		O_ShowBallQueueOnStartup = "Show Ball Queue info on startup",
 		-- THE BELOW SCREEN LABELS NEED TRANSLATION
 		TabCommands = "Commands",
 		TabRewards = "Rewards",
@@ -713,6 +719,7 @@ ScreenResources{
 		MenuExtensions = "Extensions", -- NEEDS TRANSLATION
 		MenuCommands = "Commands", -- NEEDS TRANSLATION
 		MenuBasicCommands = "Basic Commands", -- NEEDS TRANSLATION
+		MenuAdvancedCommands = "Advanced Commands", -- NEEDS TRANSLATION
 		MenuOtherCommands = "Other Commands", -- NEEDS TRANSLATION
 		MenuInfoLookup = "Info Lookup", -- NEEDS TRANSLATION
 		MenuPokemon = "Pokémon", -- NEEDS TRANSLATION
@@ -757,6 +764,8 @@ ScreenResources{
 		OptionCountEnemyPP = "Count enemy PP usage", -- NEEDS TRANSLATION
 		OptionShowLastDamage = "Show last damage calcs", -- NEEDS TRANSLATION
 		OptionRevealRandomizedInfo = "Show random move/type data", -- NEEDS TRANSLATION
+		OptionShowHealsAsValue = "Show heals as whole number", -- NEEDS TRANSLATION
+		OptionShowBallCatchRate = "Show Poke Ball catch rate", -- NEEDS TRANSLATION
 		OptionAutodetectGameLanguage = "Autodetect game language", -- NEEDS TRANSLATION
 		OptionPremadeRoms = "Use premade ROMs", -- NEEDS TRANSLATION
 		OptionGenerateRom = "Generate a ROM each time", -- NEEDS TRANSLATION
@@ -852,6 +861,7 @@ ScreenResources{
 		TrackerSpAttack = "SPA", -- NEEDS TRANSLATION
 		TrackerSpDefense = "SPD", -- NEEDS TRANSLATION
 		TrackerSpeed = "SPE", -- NEEDS TRANSLATION
+		TrackerCatchRate = "Catch rate", -- NEEDS TRANSLATION
 		TrackerSurvivalPCs = "Survival PCs", -- NEEDS TRANSLATION
 		TrackerHeals = "Heals", -- NEEDS TRANSLATION
 		TrackerLastSeen = "Last seen", -- NEEDS TRANSLATION

diff --git a/ironmon_tracker/Languages/Japanese.lua b/ironmon_tracker/Languages/Japanese.lua
@@ -130,6 +130,7 @@ ScreenResources{
 		HeaderPP = "ＰＰ",
 		HeaderPow = "威力",
 		HeaderAcc = "命中",
+		ToCatch = "to catch", -- NEEDS TRANSLATION
 		LeaveANote = "メモを残す",
 		DamageTaken = "ダメージ",
 		DamageTakenInTeams = "ダメージ合計",
@@ -237,6 +238,8 @@ ScreenResources{
 		ButtonEditTime = "Edit", -- NEEDS TRANSLATION
 		ButtonRelocateTime = "Relocate", -- NEEDS TRANSLATION
 		OptionShowRandomBallPicker = "Show random ball picker", -- NEEDS TRANSLATION
+		OptionShowHealsAsValue = "Show heals as whole number", -- NEEDS TRANSLATION
+		OptionShowBallCatchRate = "Show Poké Ball catch rate", -- NEEDS TRANSLATION
 		OptionDisplayRepelUsage = "Display repel usage", -- NEEDS TRANSLATION
 		OptionDisplayPedometer = "Display step pedometer", -- NEEDS TRANSLATION
 		OptionDisplayPlayTime = "Display play time", -- NEEDS TRANSLATION
@@ -637,6 +640,8 @@ ScreenResources{
 		CMD_Progress_Help = "> Displays fun progress percentages for the current game.",
 		CMD_Log_Name = "Log Randomizer Settings",
 		CMD_Log_Help = "> If the log has been opened, displays shareable randomizer settings from the log for current game.",
+		CMD_BallQueue_Name = "Ball Queue",
+		CMD_BallQueue_Help = "> Displays the size of the ball queue and the current pick, if any.",
 		CMD_About_Name = "About the Tracker",
 		CMD_About_Help = "> Displays info about the Ironmon Tracker and game being played.",
 		CMD_Help_Name = "Command Help",
@@ -656,6 +661,7 @@ ScreenResources{
 		O_WordForMiddle = "Word for Middle",
 		O_WordForRight = "Word for Right",
 		O_WordForRandom = "Word for Random",
+		O_ShowBallQueueOnStartup = "Show Ball Queue info on startup",
 		-- THE BELOW SCREEN LABELS NEED TRANSLATION
 		TabCommands = "Commands",
 		TabRewards = "Rewards",
@@ -715,6 +721,7 @@ ScreenResources{
 		MenuExtensions = "Extensions", -- NEEDS TRANSLATION
 		MenuCommands = "Commands", -- NEEDS TRANSLATION
 		MenuBasicCommands = "Basic Commands", -- NEEDS TRANSLATION
+		MenuAdvancedCommands = "Advanced Commands", -- NEEDS TRANSLATION
 		MenuOtherCommands = "Other Commands", -- NEEDS TRANSLATION
 		MenuInfoLookup = "Info Lookup", -- NEEDS TRANSLATION
 		MenuPokemon = "Pokémon", -- NEEDS TRANSLATION
@@ -759,6 +766,8 @@ ScreenResources{
 		OptionCountEnemyPP = "Count enemy PP usage", -- NEEDS TRANSLATION
 		OptionShowLastDamage = "Show last damage calcs", -- NEEDS TRANSLATION
 		OptionRevealRandomizedInfo = "Show random move/type data", -- NEEDS TRANSLATION
+		OptionShowHealsAsValue = "Show heals as whole number", -- NEEDS TRANSLATION
+		OptionShowBallCatchRate = "Show Poke Ball catch rate", -- NEEDS TRANSLATION
 		OptionAutodetectGameLanguage = "Autodetect game language", -- NEEDS TRANSLATION
 		OptionPremadeRoms = "Use premade ROMs", -- NEEDS TRANSLATION
 		OptionGenerateRom = "Generate a ROM each time", -- NEEDS TRANSLATION
@@ -854,6 +863,7 @@ ScreenResources{
 		TrackerSpAttack = "SPA", -- NEEDS TRANSLATION
 		TrackerSpDefense = "SPD", -- NEEDS TRANSLATION
 		TrackerSpeed = "SPE", -- NEEDS TRANSLATION
+		TrackerCatchRate = "Catch rate", -- NEEDS TRANSLATION
 		TrackerSurvivalPCs = "Survival PCs", -- NEEDS TRANSLATION
 		TrackerHeals = "Heals", -- NEEDS TRANSLATION
 		TrackerLastSeen = "Last seen", -- NEEDS TRANSLATION

diff --git a/ironmon_tracker/Languages/Spanish.lua b/ironmon_tracker/Languages/Spanish.lua
@@ -130,6 +130,7 @@ ScreenResources{
 		HeaderPP = "PP", -- NEEDS TRANSLATION
 		HeaderPow = "Pow", -- NEEDS TRANSLATION
 		HeaderAcc = "Acc", -- NEEDS TRANSLATION
+		ToCatch = "to catch", -- NEEDS TRANSLATION
 		LeaveANote = "Leave a note", -- NEEDS TRANSLATION
 		DamageTaken = "damage", -- NEEDS TRANSLATION
 		DamageTakenInTeams = "Total received", -- NEEDS TRANSLATION
@@ -235,6 +236,8 @@ ScreenResources{
 		ButtonEditTime = "Edit", -- NEEDS TRANSLATION
 		ButtonRelocateTime = "Relocate", -- NEEDS TRANSLATION
 		OptionShowRandomBallPicker = "Show random ball picker", -- NEEDS TRANSLATION
+		OptionShowHealsAsValue = "Show heals as whole number", -- NEEDS TRANSLATION
+		OptionShowBallCatchRate = "Show Poké Ball catch rate", -- NEEDS TRANSLATION
 		OptionDisplayRepelUsage = "Display repel usage", -- NEEDS TRANSLATION
 		OptionDisplayPedometer = "Display step pedometer", -- NEEDS TRANSLATION
 		OptionDisplayPlayTime = "Display play time", -- NEEDS TRANSLATION
@@ -635,6 +638,8 @@ ScreenResources{
 		CMD_Progress_Help = "> Displays fun progress percentages for the current game.",
 		CMD_Log_Name = "Log Randomizer Settings",
 		CMD_Log_Help = "> If the log has been opened, displays shareable randomizer settings from the log for current game.",
+		CMD_BallQueue_Name = "Ball Queue",
+		CMD_BallQueue_Help = "> Displays the size of the ball queue and the current pick, if any.",
 		CMD_About_Name = "About the Tracker",
 		CMD_About_Help = "> Displays info about the Ironmon Tracker and game being played.",
 		CMD_Help_Name = "Command Help",
@@ -654,6 +659,7 @@ ScreenResources{
 		O_WordForMiddle = "Word for Middle",
 		O_WordForRight = "Word for Right",
 		O_WordForRandom = "Word for Random",
+		O_ShowBallQueueOnStartup = "Show Ball Queue info on startup",
 		-- THE BELOW SCREEN LABELS NEED TRANSLATION
 		TabCommands = "Commands",
 		TabRewards = "Rewards",
@@ -713,6 +719,7 @@ ScreenResources{
 		MenuExtensions = "Extensions", -- NEEDS TRANSLATION
 		MenuCommands = "Commands", -- NEEDS TRANSLATION
 		MenuBasicCommands = "Basic Commands", -- NEEDS TRANSLATION
+		MenuAdvancedCommands = "Advanced Commands", -- NEEDS TRANSLATION
 		MenuOtherCommands = "Other Commands", -- NEEDS TRANSLATION
 		MenuInfoLookup = "Info Lookup", -- NEEDS TRANSLATION
 		MenuPokemon = "Pokémon", -- NEEDS TRANSLATION
@@ -757,6 +764,8 @@ ScreenResources{
 		OptionCountEnemyPP = "Count enemy PP usage", -- NEEDS TRANSLATION
 		OptionShowLastDamage = "Show last damage calcs", -- NEEDS TRANSLATION
 		OptionRevealRandomizedInfo = "Show random move/type data", -- NEEDS TRANSLATION
+		OptionShowHealsAsValue = "Show heals as whole number", -- NEEDS TRANSLATION
+		OptionShowBallCatchRate = "Show Poke Ball catch rate", -- NEEDS TRANSLATION
 		OptionAutodetectGameLanguage = "Autodetect game language", -- NEEDS TRANSLATION
 		OptionPremadeRoms = "Use premade ROMs", -- NEEDS TRANSLATION
 		OptionGenerateRom = "Generate a ROM each time", -- NEEDS TRANSLATION
@@ -852,6 +861,7 @@ ScreenResources{
 		TrackerSpAttack = "SPA", -- NEEDS TRANSLATION
 		TrackerSpDefense = "SPD", -- NEEDS TRANSLATION
 		TrackerSpeed = "SPE", -- NEEDS TRANSLATION
+		TrackerCatchRate = "Catch rate", -- NEEDS TRANSLATION
 		TrackerSurvivalPCs = "Survival PCs", -- NEEDS TRANSLATION
 		TrackerHeals = "Heals", -- NEEDS TRANSLATION
 		TrackerLastSeen = "Last seen", -- NEEDS TRANSLATION