Fixed another crash when entering a map with no map metadata, fixed Sky Drop failing causing the target to remain in the air, decapitalised some Debug menu text

2025-12-06 06:01:46 +00:00 · 2023-07-12 21:06:54 +01:00
parent 104bf2b598
commit 8287f32a5e
10 changed files with 212 additions and 213 deletions
--- a/Data/Scripts/005_Sprites/004_Sprite_Reflection.rb
+++ b/Data/Scripts/005_Sprites/004_Sprite_Reflection.rb
@@ -66,7 +66,7 @@ class Sprite_Reflection
      @sprite.z        = -50   # Still water is -100, map is 0 and above
      @sprite.z        += 1 if event == $game_player
      @sprite.zoom_x   = @parent_sprite.zoom_x
-      if Settings::ANIMATE_REFLECTIONS && !GameData::MapMetadata.get(event.map_id).still_reflections
+      if Settings::ANIMATE_REFLECTIONS && !GameData::MapMetadata.try_get(event.map_id)&.still_reflections
        @sprite.zoom_x   += 0.05 * @sprite.zoom_x * Math.sin(2 * Math::PI * System.uptime)
      end
      @sprite.zoom_y   = @parent_sprite.zoom_y
--- a/Data/Scripts/011_Battle/003_Move/009_MoveEffects_MultiHit.rb
+++ b/Data/Scripts/011_Battle/003_Move/009_MoveEffects_MultiHit.rb
@@ -471,8 +471,8 @@ class Battle::Move::TwoTurnAttackInvulnerableInSkyTargetCannotAct < Battle::Move
    target.effects[PBEffects::SkyDrop] = user.index
  end

-  def pbAttackingTurnEffect(user, target)
-    target.effects[PBEffects::SkyDrop] = -1
+  def pbEffectAfterAllHits(user, target)
+    target.effects[PBEffects::SkyDrop] = -1 if @damagingTurn
  end
 end

--- a/Data/Scripts/020_Debug/002_Animation
+++ b/Data/Scripts/020_Debug/002_Animation
@@ -949,7 +949,6 @@ module BattleAnimationEditor
  # Main
  #=============================================================================
  def animationEditorMain(animation)
-    echoln animation.selected
    viewport = Viewport.new(0, 0, Settings::SCREEN_WIDTH + 288, Settings::SCREEN_HEIGHT + 288)
    viewport.z = 99999
    # Canvas
--- a/Data/Scripts/020_Debug/003_Debug
+++ b/Data/Scripts/020_Debug/003_Debug
@@ -2,14 +2,14 @@
 # Field options
 #===============================================================================
 MenuHandlers.add(:debug_menu, :field_menu, {
-  "name"        => _INTL("Field Options..."),
+  "name"        => _INTL("Field options..."),
  "parent"      => :main,
  "description" => _INTL("Warp to maps, edit switches/variables, use the PC, edit Day Care, etc."),
  "always_show" => false
 })

 MenuHandlers.add(:debug_menu, :warp, {
-  "name"        => _INTL("Warp to Map"),
+  "name"        => _INTL("Warp to map"),
  "parent"      => :field_menu,
  "description" => _INTL("Instantly warp to another map of your choice."),
  "effect"      => proc { |sprites, viewport|
@@ -141,7 +141,7 @@ MenuHandlers.add(:debug_menu, :safari_zone_and_bug_contest, {
 })

 MenuHandlers.add(:debug_menu, :edit_field_effects, {
-  "name"        => _INTL("Change Field Effects"),
+  "name"        => _INTL("Change field effects"),
  "parent"      => :field_menu,
  "description" => _INTL("Edit Repel steps, Strength and Flash usage, and Black/White Flute effects."),
  "effect"      => proc {
@@ -196,7 +196,7 @@ MenuHandlers.add(:debug_menu, :edit_field_effects, {
 })

 MenuHandlers.add(:debug_menu, :refresh_map, {
-  "name"        => _INTL("Refresh Map"),
+  "name"        => _INTL("Refresh map"),
  "parent"      => :field_menu,
  "description" => _INTL("Make all events on this map, and common events, refresh themselves."),
  "effect"      => proc {
@@ -215,7 +215,7 @@ MenuHandlers.add(:debug_menu, :day_care, {
 })

 MenuHandlers.add(:debug_menu, :storage_wallpapers, {
-  "name"        => _INTL("Toggle Storage Wallpapers"),
+  "name"        => _INTL("Toggle storage wallpapers"),
  "parent"      => :field_menu,
  "description" => _INTL("Unlock and lock special wallpapers used in Pokémon storage."),
  "effect"      => proc {
@@ -253,7 +253,7 @@ MenuHandlers.add(:debug_menu, :storage_wallpapers, {
 })

 MenuHandlers.add(:debug_menu, :skip_credits, {
-  "name"        => _INTL("Skip Credits"),
+  "name"        => _INTL("Skip credits"),
  "parent"      => :field_menu,
  "description" => _INTL("Toggle whether credits can be ended early by pressing the Use input."),
  "effect"      => proc {
@@ -267,14 +267,14 @@ MenuHandlers.add(:debug_menu, :skip_credits, {
 # Battle options
 #===============================================================================
 MenuHandlers.add(:debug_menu, :battle_menu, {
-  "name"        => _INTL("Battle Options..."),
+  "name"        => _INTL("Battle options..."),
  "parent"      => :main,
  "description" => _INTL("Start battles, reset this map's trainers, ready rematches, edit roamers, etc."),
  "always_show" => false
 })

 MenuHandlers.add(:debug_menu, :test_wild_battle, {
-  "name"        => _INTL("Test Wild Battle"),
+  "name"        => _INTL("Test wild battle"),
  "parent"      => :battle_menu,
  "description" => _INTL("Start a single battle against a wild Pokémon. You choose the species/level."),
  "effect"      => proc {
@@ -297,7 +297,7 @@ MenuHandlers.add(:debug_menu, :test_wild_battle, {
 })

 MenuHandlers.add(:debug_menu, :test_wild_battle_advanced, {
-  "name"        => _INTL("Test Wild Battle Advanced"),
+  "name"        => _INTL("Test wild battle advanced"),
  "parent"      => :battle_menu,
  "description" => _INTL("Start a battle against 1 or more wild Pokémon. Battle size is your choice."),
  "effect"      => proc {
@@ -366,7 +366,7 @@ MenuHandlers.add(:debug_menu, :test_wild_battle_advanced, {
 })

 MenuHandlers.add(:debug_menu, :test_trainer_battle, {
-  "name"        => _INTL("Test Trainer Battle"),
+  "name"        => _INTL("Test trainer battle"),
  "parent"      => :battle_menu,
  "description" => _INTL("Start a single battle against a trainer of your choice."),
  "effect"      => proc {
@@ -380,7 +380,7 @@ MenuHandlers.add(:debug_menu, :test_trainer_battle, {
 })

 MenuHandlers.add(:debug_menu, :test_trainer_battle_advanced, {
-  "name"        => _INTL("Test Trainer Battle Advanced"),
+  "name"        => _INTL("Test trainer battle advanced"),
  "parent"      => :battle_menu,
  "description" => _INTL("Start a battle against 1 or more trainers with a battle size of your choice."),
  "effect"      => proc {
@@ -478,7 +478,7 @@ MenuHandlers.add(:debug_menu, :test_trainer_battle_advanced, {
 })

 MenuHandlers.add(:debug_menu, :encounter_version, {
-  "name"        => _INTL("Set Encounters Version"),
+  "name"        => _INTL("Set wild encounters version"),
  "parent"      => :battle_menu,
  "description" => _INTL("Choose which version of wild encounters should be used."),
  "effect"      => proc {
@@ -501,7 +501,7 @@ MenuHandlers.add(:debug_menu, :roamers, {
 })

 MenuHandlers.add(:debug_menu, :reset_trainers, {
-  "name"        => _INTL("Reset Map's Trainers"),
+  "name"        => _INTL("Reset map's trainers"),
  "parent"      => :battle_menu,
  "description" => _INTL("Turn off Self Switches A and B for all events with \"Trainer\" in their name."),
  "effect"      => proc {
@@ -521,7 +521,7 @@ MenuHandlers.add(:debug_menu, :reset_trainers, {
 })

 MenuHandlers.add(:debug_menu, :toggle_exp_all, {
-  "name"        => _INTL("Toggle Exp. All's Effect"),
+  "name"        => _INTL("Toggle Exp. All's effect"),
  "parent"      => :battle_menu,
  "description" => _INTL("Toggle Exp. All's effect of giving Exp. to non-participants."),
  "effect"      => proc {
@@ -532,7 +532,7 @@ MenuHandlers.add(:debug_menu, :toggle_exp_all, {
 })

 MenuHandlers.add(:debug_menu, :toggle_logging, {
-  "name"        => _INTL("Toggle Battle Logging"),
+  "name"        => _INTL("Toggle logging of battle messages"),
  "parent"      => :battle_menu,
  "description" => _INTL("Record debug logs for battles in Data/debuglog.txt."),
  "effect"      => proc {
@@ -546,14 +546,14 @@ MenuHandlers.add(:debug_menu, :toggle_logging, {
 # Pokémon options
 #===============================================================================
 MenuHandlers.add(:debug_menu, :pokemon_menu, {
-  "name"        => _INTL("Pokémon Options..."),
+  "name"        => _INTL("Pokémon options..."),
  "parent"      => :main,
  "description" => _INTL("Heal the party, give Pokémon, fill/empty PC storage, etc."),
  "always_show" => false
 })

 MenuHandlers.add(:debug_menu, :heal_party, {
-  "name"        => _INTL("Heal Party"),
+  "name"        => _INTL("Heal party"),
  "parent"      => :pokemon_menu,
  "description" => _INTL("Fully heal the HP/status/PP of all Pokémon in the party."),
  "effect"      => proc {
@@ -591,7 +591,7 @@ MenuHandlers.add(:debug_menu, :add_pokemon, {
 })

 MenuHandlers.add(:debug_menu, :fill_boxes, {
-  "name"        => _INTL("Fill Storage Boxes"),
+  "name"        => _INTL("Fill storage boxes"),
  "parent"      => :pokemon_menu,
  "description" => _INTL("Puts one Pokémon of each species (at Level 50) in storage."),
  "effect"      => proc {
@@ -638,7 +638,7 @@ MenuHandlers.add(:debug_menu, :fill_boxes, {
 })

 MenuHandlers.add(:debug_menu, :clear_boxes, {
-  "name"        => _INTL("Clear Storage Boxes"),
+  "name"        => _INTL("Clear storage boxes"),
  "parent"      => :pokemon_menu,
  "description" => _INTL("Remove all Pokémon in storage."),
  "effect"      => proc {
@@ -652,7 +652,7 @@ MenuHandlers.add(:debug_menu, :clear_boxes, {
 })

 MenuHandlers.add(:debug_menu, :give_demo_party, {
-  "name"        => _INTL("Give Demo Party"),
+  "name"        => _INTL("Give demo party"),
  "parent"      => :pokemon_menu,
  "description" => _INTL("Give yourself 6 preset Pokémon. They overwrite the current party."),
  "effect"      => proc {
@@ -693,7 +693,7 @@ MenuHandlers.add(:debug_menu, :give_demo_party, {
 })

 MenuHandlers.add(:debug_menu, :quick_hatch_party_eggs, {
-  "name"        => _INTL("Quick Hatch"),
+  "name"        => _INTL("Quick hatch all party eggs"),
  "parent"      => :pokemon_menu,
  "description" => _INTL("Make all eggs in the party require just one more step to hatch."),
  "effect"      => proc {
@@ -703,7 +703,7 @@ MenuHandlers.add(:debug_menu, :quick_hatch_party_eggs, {
 })

 MenuHandlers.add(:debug_menu, :open_storage, {
-  "name"        => _INTL("Access Pokémon Storage"),
+  "name"        => _INTL("Access Pokémon storage"),
  "parent"      => :pokemon_menu,
  "description" => _INTL("Opens the Pokémon storage boxes in Organize Boxes mode."),
  "effect"      => proc {
@@ -719,7 +719,7 @@ MenuHandlers.add(:debug_menu, :open_storage, {
 # Shadow Pokémon options
 #===============================================================================
 MenuHandlers.add(:debug_menu, :shadow_pokemon_menu, {
-  "name"        => _INTL("Shadow Pokémon Options..."),
+  "name"        => _INTL("Shadow Pokémon options..."),
  "parent"      => :pokemon_menu,
  "description" => _INTL("Snag Machine and purification."),
  "always_show" => false
@@ -737,7 +737,7 @@ MenuHandlers.add(:debug_menu, :toggle_snag_machine, {
 })

 MenuHandlers.add(:debug_menu, :toggle_purify_chamber_access, {
-  "name"        => _INTL("Toggle Purify Chamber Access"),
+  "name"        => _INTL("Toggle Purify Chamber access"),
  "parent"      => :shadow_pokemon_menu,
  "description" => _INTL("Toggle access to the Purify Chamber via the PC."),
  "effect"      => proc {
@@ -769,14 +769,14 @@ MenuHandlers.add(:debug_menu, :relic_stone, {
 # Item options
 #===============================================================================
 MenuHandlers.add(:debug_menu, :items_menu, {
-  "name"        => _INTL("Item Options..."),
+  "name"        => _INTL("Item options..."),
  "parent"      => :main,
  "description" => _INTL("Give and take items."),
  "always_show" => false
 })

 MenuHandlers.add(:debug_menu, :add_item, {
-  "name"        => _INTL("Add Item"),
+  "name"        => _INTL("Add item"),
  "parent"      => :items_menu,
  "description" => _INTL("Choose an item and a quantity of it to add to the Bag."),
  "effect"      => proc {
@@ -840,14 +840,14 @@ MenuHandlers.add(:debug_menu, :empty_bag, {
 # Player options
 #===============================================================================
 MenuHandlers.add(:debug_menu, :player_menu, {
-  "name"        => _INTL("Player Options..."),
+  "name"        => _INTL("Player options..."),
  "parent"      => :main,
  "description" => _INTL("Set money, badges, Pokédexes, player's appearance and name, etc."),
  "always_show" => false
 })

 MenuHandlers.add(:debug_menu, :set_money, {
-  "name"        => _INTL("Set Money"),
+  "name"        => _INTL("Set money"),
  "parent"      => :player_menu,
  "description" => _INTL("Edit how much money, Game Corner Coins and Battle Points you have."),
  "effect"      => proc {
@@ -881,7 +881,7 @@ MenuHandlers.add(:debug_menu, :set_money, {
 })

 MenuHandlers.add(:debug_menu, :set_badges, {
-  "name"        => _INTL("Set Badges"),
+  "name"        => _INTL("Set Gym Badges"),
  "parent"      => :player_menu,
  "description" => _INTL("Toggle possession of each Gym Badge."),
  "effect"      => proc {
@@ -908,7 +908,7 @@ MenuHandlers.add(:debug_menu, :set_badges, {
 })

 MenuHandlers.add(:debug_menu, :toggle_running_shoes, {
-  "name"        => _INTL("Toggle Running Shoes"),
+  "name"        => _INTL("Toggle running shoes"),
  "parent"      => :player_menu,
  "description" => _INTL("Toggle possession of running shoes."),
  "effect"      => proc {
@@ -919,7 +919,7 @@ MenuHandlers.add(:debug_menu, :toggle_running_shoes, {
 })

 MenuHandlers.add(:debug_menu, :toggle_pokedex, {
-  "name"        => _INTL("Toggle Pokédex and Dexes"),
+  "name"        => _INTL("Toggle Pokédex and Regional Dexes"),
  "parent"      => :player_menu,
  "description" => _INTL("Toggle possession of the Pokédex, and edit Regional Dex accessibility."),
  "effect"      => proc {
@@ -959,7 +959,7 @@ MenuHandlers.add(:debug_menu, :toggle_pokegear, {
 })

 MenuHandlers.add(:debug_menu, :edit_phone_contacts, {
-  "name"        => _INTL("Edit Phone And Contacts"),
+  "name"        => _INTL("Edit phone and contacts"),
  "parent"      => :player_menu,
  "description" => _INTL("Edit properties of the phone and of contacts registered in it."),
  "effect"      => proc {
@@ -1064,7 +1064,7 @@ MenuHandlers.add(:debug_menu, :edit_phone_contacts, {
 })

 MenuHandlers.add(:debug_menu, :toggle_box_link, {
-  "name"        => _INTL("Toggle Party Screen Access To Storage"),
+  "name"        => _INTL("Toggle access to storage from party screen"),
  "parent"      => :player_menu,
  "description" => _INTL("Toggle Box Link's effect of accessing Pokémon storage via the party screen."),
  "effect"      => proc {
@@ -1075,7 +1075,7 @@ MenuHandlers.add(:debug_menu, :toggle_box_link, {
 })

 MenuHandlers.add(:debug_menu, :set_player_character, {
-  "name"        => _INTL("Set Player Character"),
+  "name"        => _INTL("Set player character"),
  "parent"      => :player_menu,
  "description" => _INTL("Edit the player's character, as defined in \"metadata.txt\"."),
  "effect"      => proc {
@@ -1100,7 +1100,7 @@ MenuHandlers.add(:debug_menu, :set_player_character, {
 })

 MenuHandlers.add(:debug_menu, :change_outfit, {
-  "name"        => _INTL("Set Player Outfit"),
+  "name"        => _INTL("Set player outfit"),
  "parent"      => :player_menu,
  "description" => _INTL("Edit the player's outfit number."),
  "effect"      => proc {
@@ -1114,7 +1114,7 @@ MenuHandlers.add(:debug_menu, :change_outfit, {
 })

 MenuHandlers.add(:debug_menu, :rename_player, {
-  "name"        => _INTL("Set Player Name"),
+  "name"        => _INTL("Set player name"),
  "parent"      => :player_menu,
  "description" => _INTL("Rename the player."),
  "effect"      => proc {
@@ -1134,7 +1134,7 @@ MenuHandlers.add(:debug_menu, :rename_player, {
 })

 MenuHandlers.add(:debug_menu, :random_id, {
-  "name"        => _INTL("Randomize Player ID"),
+  "name"        => _INTL("Randomize player ID"),
  "parent"      => :player_menu,
  "description" => _INTL("Generate a random new ID for the player."),
  "effect"      => proc {
@@ -1147,7 +1147,7 @@ MenuHandlers.add(:debug_menu, :random_id, {
 # PBS file editors
 #===============================================================================
 MenuHandlers.add(:debug_menu, :pbs_editors_menu, {
-  "name"        => _INTL("PBS File Editors..."),
+  "name"        => _INTL("PBS file editors..."),
  "parent"      => :main,
  "description" => _INTL("Edit information in the PBS files.")
 })
@@ -1238,7 +1238,7 @@ MenuHandlers.add(:debug_menu, :position_sprites, {
 })

 MenuHandlers.add(:debug_menu, :auto_position_sprites, {
-  "name"        => _INTL("Auto-Set pokemon_metrics.txts"),
+  "name"        => _INTL("Auto-set pokemon_metrics.txts"),
  "parent"      => :pbs_editors_menu,
  "description" => _INTL("Automatically reposition all Pokémon sprites in battle. Don't use lightly."),
  "effect"      => proc {
@@ -1265,13 +1265,13 @@ MenuHandlers.add(:debug_menu, :set_pokedex_lists, {
 # Other editors
 #===============================================================================
 MenuHandlers.add(:debug_menu, :editors_menu, {
-  "name"        => _INTL("Other Editors..."),
+  "name"        => _INTL("Other editors..."),
  "parent"      => :main,
  "description" => _INTL("Edit battle animations, terrain tags, map data, etc.")
 })

 MenuHandlers.add(:debug_menu, :animation_editor, {
-  "name"        => _INTL("Battle Animation Editor"),
+  "name"        => _INTL("Battle animation editor"),
  "parent"      => :editors_menu,
  "description" => _INTL("Edit the battle animations."),
  "effect"      => proc {
@@ -1280,7 +1280,7 @@ MenuHandlers.add(:debug_menu, :animation_editor, {
 })

 MenuHandlers.add(:debug_menu, :animation_organiser, {
-  "name"        => _INTL("Battle Animation Organiser"),
+  "name"        => _INTL("Battle animation organiser"),
  "parent"      => :editors_menu,
  "description" => _INTL("Rearrange/add/delete battle animations."),
  "effect"      => proc {
@@ -1289,7 +1289,7 @@ MenuHandlers.add(:debug_menu, :animation_organiser, {
 })

 MenuHandlers.add(:debug_menu, :import_animations, {
-  "name"        => _INTL("Import All Battle Animations"),
+  "name"        => _INTL("Import all battle animations"),
  "parent"      => :editors_menu,
  "description" => _INTL("Import all battle animations from the \"Animations\" folder."),
  "effect"      => proc {
@@ -1298,7 +1298,7 @@ MenuHandlers.add(:debug_menu, :import_animations, {
 })

 MenuHandlers.add(:debug_menu, :export_animations, {
-  "name"        => _INTL("Export All Battle Animations"),
+  "name"        => _INTL("Export all battle animations"),
  "parent"      => :editors_menu,
  "description" => _INTL("Export all battle animations individually to the \"Animations\" folder."),
  "effect"      => proc {
@@ -1307,7 +1307,7 @@ MenuHandlers.add(:debug_menu, :export_animations, {
 })

 MenuHandlers.add(:debug_menu, :set_terrain_tags, {
-  "name"        => _INTL("Edit Terrain Tags"),
+  "name"        => _INTL("Edit terrain tags"),
  "parent"      => :editors_menu,
  "description" => _INTL("Edit the terrain tags of tiles in tilesets. Required for tags 8+."),
  "effect"      => proc {
@@ -1316,7 +1316,7 @@ MenuHandlers.add(:debug_menu, :set_terrain_tags, {
 })

 MenuHandlers.add(:debug_menu, :fix_invalid_tiles, {
-  "name"        => _INTL("Fix Invalid Tiles"),
+  "name"        => _INTL("Fix invalid tiles"),
  "parent"      => :editors_menu,
  "description" => _INTL("Scans all maps and erases non-existent tiles."),
  "effect"      => proc {
@@ -1328,13 +1328,13 @@ MenuHandlers.add(:debug_menu, :fix_invalid_tiles, {
 # Other options
 #===============================================================================
 MenuHandlers.add(:debug_menu, :files_menu, {
-  "name"        => _INTL("Files Options..."),
+  "name"        => _INTL("Files options..."),
  "parent"      => :main,
  "description" => _INTL("Compile, generate PBS files, translations, Mystery Gifts, etc.")
 })

 MenuHandlers.add(:debug_menu, :compile_data, {
-  "name"        => _INTL("Compile Data"),
+  "name"        => _INTL("Compile data"),
  "parent"      => :files_menu,
  "description" => _INTL("Fully compile all data."),
  "effect"      => proc {
@@ -1346,7 +1346,7 @@ MenuHandlers.add(:debug_menu, :compile_data, {
 })

 MenuHandlers.add(:debug_menu, :create_pbs_files, {
-  "name"        => _INTL("Create PBS File(s)"),
+  "name"        => _INTL("Create PBS file(s)"),
  "parent"      => :files_menu,
  "description" => _INTL("Choose one or all PBS files and create it."),
  "effect"      => proc {
@@ -1410,7 +1410,7 @@ MenuHandlers.add(:debug_menu, :create_pbs_files, {
 })

 MenuHandlers.add(:debug_menu, :rename_files, {
-  "name"        => _INTL("Rename Outdated Files"),
+  "name"        => _INTL("Rename outdated files"),
  "parent"      => :files_menu,
  "description" => _INTL("Check for files with outdated names and rename/move them. Can alter map data."),
  "effect"      => proc {
@@ -1422,7 +1422,7 @@ MenuHandlers.add(:debug_menu, :rename_files, {
 })

 MenuHandlers.add(:debug_menu, :extract_text, {
-  "name"        => _INTL("Extract Text For Translation"),
+  "name"        => _INTL("Extract text for translation"),
  "parent"      => :files_menu,
  "description" => _INTL("Extract all text in the game to text files for translating."),
  "effect"      => proc {
@@ -1456,7 +1456,7 @@ MenuHandlers.add(:debug_menu, :extract_text, {
 })

 MenuHandlers.add(:debug_menu, :compile_text, {
-  "name"        => _INTL("Compile Translated Text"),
+  "name"        => _INTL("Compile translated text"),
  "parent"      => :files_menu,
  "description" => _INTL("Import text files and convert them into a language file."),
  "effect"      => proc {
@@ -1487,7 +1487,7 @@ MenuHandlers.add(:debug_menu, :mystery_gift, {
 })

 MenuHandlers.add(:debug_menu, :reload_system_cache, {
-  "name"        => _INTL("Reload System Cache"),
+  "name"        => _INTL("Reload system cache"),
  "parent"      => :files_menu,
  "description" => _INTL("Refreshes the system's file cache. Use if you change a file while playing."),
  "effect"      => proc {
--- a/menus/004_Debug_BattleCommands.rb
+++ b/menus/004_Debug_BattleCommands.rb
@@ -8,7 +8,7 @@ MenuHandlers.add(:battle_debug_menu, :battlers, {
 })

 MenuHandlers.add(:battle_debug_menu, :list_player_battlers, {
-  "name"        => _INTL("Player-Side Battlers"),
+  "name"        => _INTL("Player-side battlers"),
  "parent"      => :battlers,
  "description" => _INTL("Edit Pokémon on the player's side of battle."),
  "effect"      => proc { |battle|
@@ -34,7 +34,7 @@ MenuHandlers.add(:battle_debug_menu, :list_player_battlers, {
 })

 MenuHandlers.add(:battle_debug_menu, :list_foe_battlers, {
-  "name"        => _INTL("Foe-Side Battlers"),
+  "name"        => _INTL("Foe-side battlers"),
  "parent"      => :battlers,
  "description" => _INTL("Edit Pokémon on the opposing side of battle."),
  "effect"      => proc { |battle|
@@ -54,7 +54,7 @@ MenuHandlers.add(:battle_debug_menu, :list_foe_battlers, {
 })

 MenuHandlers.add(:battle_debug_menu, :speed_order, {
-  "name"        => _INTL("Battler Speed Order"),
+  "name"        => _INTL("View battler speed order"),
  "parent"      => :battlers,
  "description" => _INTL("Show all battlers in order from fastest to slowest."),
  "effect"      => proc { |battle|
@@ -74,7 +74,7 @@ MenuHandlers.add(:battle_debug_menu, :speed_order, {
 # Pokémon
 #===============================================================================
 MenuHandlers.add(:battle_debug_menu, :pokemon_teams, {
-  "name"        => _INTL("Pokémon Teams"),
+  "name"        => _INTL("Pokémon teams"),
  "parent"      => :main,
  "description" => _INTL("Look at and edit all Pokémon in each team."),
  "effect"      => proc { |battle|
@@ -133,13 +133,13 @@ MenuHandlers.add(:battle_debug_menu, :pokemon_teams, {
 # Trainer Options
 #===============================================================================
 MenuHandlers.add(:battle_debug_menu, :trainers, {
-  "name"        => _INTL("Trainer Options..."),
+  "name"        => _INTL("Trainer options..."),
  "parent"      => :main,
  "description" => _INTL("Variables that apply to trainers.")
 })

 MenuHandlers.add(:battle_debug_menu, :trainer_items, {
-  "name"        => _INTL("NPC Trainer Items"),
+  "name"        => _INTL("NPC trainer items"),
  "parent"      => :trainers,
  "description" => _INTL("View and change the items each NPC trainer has access to."),
  "effect"      => proc { |battle|
@@ -229,7 +229,7 @@ MenuHandlers.add(:battle_debug_menu, :mega_evolution, {
 # Field Options
 #===============================================================================
 MenuHandlers.add(:battle_debug_menu, :field, {
-  "name"        => _INTL("Field Effects..."),
+  "name"        => _INTL("Field effects..."),
  "parent"      => :main,
  "description" => _INTL("Effects that apply to the whole battlefield.")
 })
@@ -359,7 +359,7 @@ MenuHandlers.add(:battle_debug_menu, :terrain, {
 })

 MenuHandlers.add(:battle_debug_menu, :environment_time, {
-  "name"        => _INTL("Environment/Time"),
+  "name"        => _INTL("Environment/time"),
  "parent"      => :field,
  "description" => _INTL("Set the battle's environment and time of day."),
  "effect"      => proc { |battle|
@@ -397,7 +397,7 @@ MenuHandlers.add(:battle_debug_menu, :environment_time, {
 })

 MenuHandlers.add(:battle_debug_menu, :backdrop, {
-  "name"        => _INTL("Backdrop Names"),
+  "name"        => _INTL("Backdrop names"),
  "parent"      => :field,
  "description" => _INTL("Set the names of the backdrop and base graphics."),
  "effect"      => proc { |battle|
@@ -421,7 +421,7 @@ MenuHandlers.add(:battle_debug_menu, :backdrop, {
 })

 MenuHandlers.add(:battle_debug_menu, :set_field_effects, {
-  "name"        => _INTL("Other Field Effects..."),
+  "name"        => _INTL("Other field effects..."),
  "parent"      => :field,
  "description" => _INTL("View/set other effects that apply to the whole battlefield."),
  "effect"      => proc { |battle|
@@ -432,7 +432,7 @@ MenuHandlers.add(:battle_debug_menu, :set_field_effects, {
 })

 MenuHandlers.add(:battle_debug_menu, :player_side, {
-  "name"        => _INTL("Player's Side Effects..."),
+  "name"        => _INTL("Player's side effects..."),
  "parent"      => :field,
  "description" => _INTL("Effects that apply to the side the player is on."),
  "effect"      => proc { |battle|
@@ -443,7 +443,7 @@ MenuHandlers.add(:battle_debug_menu, :player_side, {
 })

 MenuHandlers.add(:battle_debug_menu, :opposing_side, {
-  "name"        => _INTL("Foe's Side Effects..."),
+  "name"        => _INTL("Foe's side effects..."),
  "parent"      => :field,
  "description" => _INTL("Effects that apply to the opposing side."),
  "effect"      => proc { |battle|
@@ -454,7 +454,7 @@ MenuHandlers.add(:battle_debug_menu, :opposing_side, {
 })

 MenuHandlers.add(:battle_debug_menu, :position_effects, {
-  "name"        => _INTL("Battler Position Effects..."),
+  "name"        => _INTL("Battler position effects..."),
  "parent"      => :field,
  "description" => _INTL("Effects that apply to individual battler positions."),
  "effect"      => proc { |battle|
--- a/menus/005_Debug_BattlePkmnCommands.rb
+++ b/menus/005_Debug_BattlePkmnCommands.rb
@@ -2,7 +2,7 @@
 # HP/Status options
 #===============================================================================
 MenuHandlers.add(:battle_pokemon_debug_menu, :hp_status_menu, {
-  "name"   => _INTL("HP/Status..."),
+  "name"   => _INTL("HP/status..."),
  "parent" => :main,
  "usage"  => :both
 })
--- a/menus/007_Debug_PokemonCommands.rb
+++ b/menus/007_Debug_PokemonCommands.rb
@@ -2,7 +2,7 @@
 # HP/Status options
 #===============================================================================
 MenuHandlers.add(:pokemon_debug_menu, :hp_status_menu, {
-  "name"   => _INTL("HP/Status..."),
+  "name"   => _INTL("HP/status..."),
  "parent" => :main
 })

@@ -206,7 +206,7 @@ MenuHandlers.add(:pokemon_debug_menu, :set_exp, {
 })

 MenuHandlers.add(:pokemon_debug_menu, :hidden_values, {
-  "name"   => _INTL("EV/IV/pID..."),
+  "name"   => _INTL("EV/IV/personal ID..."),
  "parent" => :level_stats,
  "effect" => proc { |pkmn, pkmnid, heldpoke, settingUpBattle, screen|
    cmd = 0
--- a/Data/messages_core.dat
+++ b/Data/messages_core.dat
--- a/Text_english_core/SCRIPT_TEXTS.txt
+++ b/Text_english_core/SCRIPT_TEXTS.txt
@@ -5210,12 +5210,12 @@ Item: {1}
 Item: {1}
 (toxic)
 (toxic)
-Field Options...
-Field Options...
+Field options...
+Field options...
 Warp to maps, edit switches/variables, use the PC, edit Day Care, etc.
 Warp to maps, edit switches/variables, use the PC, edit Day Care, etc.
-Warp to Map
-Warp to Map
+Warp to map
+Warp to map
 Instantly warp to another map of your choice.
 Instantly warp to another map of your choice.
 Use PC
@@ -5250,8 +5250,8 @@ Set the time remaining (in minutes) in this Bug-Catching Contest.
 Set the time remaining (in minutes) in this Bug-Catching Contest.
 You aren't in the Safari Zone or a Bug-Catching Contest!
 You aren't in the Safari Zone or a Bug-Catching Contest!
-Change Field Effects
-Change Field Effects
+Change field effects
+Change field effects
 Edit Repel steps, Strength and Flash usage, and Black/White Flute effects.
 Edit Repel steps, Strength and Flash usage, and Black/White Flute effects.
 Repel steps: {1}
@@ -5272,8 +5272,8 @@ Set the Pokémon's level.
 Set the Pokémon's level.
 You're not in a dark map!
 You're not in a dark map!
-Refresh Map
-Refresh Map
+Refresh map
+Refresh map
 Make all events on this map, and common events, refresh themselves.
 Make all events on this map, and common events, refresh themselves.
 The map will refresh.
@@ -5282,8 +5282,8 @@ Day Care
 Day Care
 View Pokémon in the Day Care and edit them.
 View Pokémon in the Day Care and edit them.
-Toggle Storage Wallpapers
-Toggle Storage Wallpapers
+Toggle storage wallpapers
+Toggle storage wallpapers
 Unlock and lock special wallpapers used in Pokémon storage.
 Unlock and lock special wallpapers used in Pokémon storage.
 There are no special wallpapers defined.
@@ -5292,26 +5292,26 @@ Unlock all
 Unlock all
 Lock all
 Lock all
-Skip Credits
-Skip Credits
+Skip credits
+Skip credits
 Toggle whether credits can be ended early by pressing the Use input.
 Toggle whether credits can be ended early by pressing the Use input.
 Credits can be skipped when played in future.
 Credits can be skipped when played in future.
 Credits cannot be skipped when next played.
 Credits cannot be skipped when next played.
-Battle Options...
-Battle Options...
+Battle options...
+Battle options...
 Start battles, reset this map's trainers, ready rematches, edit roamers, etc.
 Start battles, reset this map's trainers, ready rematches, edit roamers, etc.
-Test Wild Battle
-Test Wild Battle
+Test wild battle
+Test wild battle
 Start a single battle against a wild Pokémon. You choose the species/level.
 Start a single battle against a wild Pokémon. You choose the species/level.
 Set the wild {1}'s level.
 Set the wild {1}'s level.
-Test Wild Battle Advanced
-Test Wild Battle Advanced
+Test wild battle advanced
+Test wild battle advanced
 Start a battle against 1 or more wild Pokémon. Battle size is your choice.
 Start a battle against 1 or more wild Pokémon. Battle size is your choice.
 <<[>>Add Pokémon<<]>>
@@ -5330,14 +5330,14 @@ Change this Pokémon?
 Change this Pokémon?
 Delete this Pokémon?
 Delete this Pokémon?
-Test Trainer Battle
-Test Trainer Battle
+Test trainer battle
+Test trainer battle
 Start a single battle against a trainer of your choice.
 Start a single battle against a trainer of your choice.
 SINGLE TRAINER
 SINGLE TRAINER
-Test Trainer Battle Advanced
-Test Trainer Battle Advanced
+Test trainer battle advanced
+Test trainer battle advanced
 Start a battle against 1 or more trainers with a battle size of your choice.
 Start a battle against 1 or more trainers with a battle size of your choice.
 <<[>>Add trainer<<]>>
@@ -5360,8 +5360,8 @@ Change this trainer?
 Change this trainer?
 Delete this trainer?
 Delete this trainer?
-Set Encounters Version
-Set Encounters Version
+Set wild encounters version
+Set wild encounters version
 Choose which version of wild encounters should be used.
 Choose which version of wild encounters should be used.
 Set encounters version to which value?
@@ -5370,36 +5370,36 @@ Roaming Pokémon
 Roaming Pokémon
 Toggle and edit all roaming Pokémon.
 Toggle and edit all roaming Pokémon.
-Reset Map's Trainers
-Reset Map's Trainers
+Reset map's trainers
+Reset map's trainers
 Turn off Self Switches A and B for all events with "Trainer" in their name.
 Turn off Self Switches A and B for all events with "Trainer" in their name.
 All Trainers on this map were reset.
 All Trainers on this map were reset.
 This command can't be used here.
 This command can't be used here.
-Toggle Exp. All's Effect
-Toggle Exp. All's Effect
+Toggle Exp. All's effect
+Toggle Exp. All's effect
 Toggle Exp. All's effect of giving Exp. to non-participants.
 Toggle Exp. All's effect of giving Exp. to non-participants.
 Enabled Exp. All's effect.
 Enabled Exp. All's effect.
 Disabled Exp. All's effect.
 Disabled Exp. All's effect.
-Toggle Battle Logging
-Toggle Battle Logging
+Toggle logging of battle messages
+Toggle logging of battle messages
 Record debug logs for battles in Data/debuglog.txt.
 Record debug logs for battles in Data/debuglog.txt.
 Debug logs for battles will be made in the Data folder.
 Debug logs for battles will be made in the Data folder.
 Debug logs for battles will not be made.
 Debug logs for battles will not be made.
-Pokémon Options...
-Pokémon Options...
+Pokémon options...
+Pokémon options...
 Heal the party, give Pokémon, fill/empty PC storage, etc.
 Heal the party, give Pokémon, fill/empty PC storage, etc.
-Heal Party
-Heal Party
+Heal party
+Heal party
 Fully heal the HP/status/PP of all Pokémon in the party.
 Fully heal the HP/status/PP of all Pokémon in the party.
 Your Pokémon were fully healed.
@@ -5414,38 +5414,38 @@ Added {1} to Pokémon storage.
 Added {1} to Pokémon storage.
 Couldn't add Pokémon because party and storage are full.
 Couldn't add Pokémon because party and storage are full.
-Fill Storage Boxes
-Fill Storage Boxes
+Fill storage boxes
+Fill storage boxes
 Puts one Pokémon of each species (at Level 50) in storage.
 Puts one Pokémon of each species (at Level 50) in storage.
 Storage boxes were filled with one Pokémon of each species.
 Storage boxes were filled with one Pokémon of each species.
 Note: The number of storage spaces ({1} boxes of {2}) is less than the number of species.
 Note: The number of storage spaces ({1} boxes of {2}) is less than the number of species.
-Clear Storage Boxes
-Clear Storage Boxes
+Clear storage boxes
+Clear storage boxes
 Remove all Pokémon in storage.
 Remove all Pokémon in storage.
 The storage boxes were cleared.
 The storage boxes were cleared.
-Give Demo Party
-Give Demo Party
+Give demo party
+Give demo party
 Give yourself 6 preset Pokémon. They overwrite the current party.
 Give yourself 6 preset Pokémon. They overwrite the current party.
 Filled party with demo Pokémon.
 Filled party with demo Pokémon.
-Quick Hatch
-Quick Hatch
+Quick hatch all party eggs
+Quick hatch all party eggs
 Make all eggs in the party require just one more step to hatch.
 Make all eggs in the party require just one more step to hatch.
 All eggs in your party now require one step to hatch.
 All eggs in your party now require one step to hatch.
-Access Pokémon Storage
-Access Pokémon Storage
+Access Pokémon storage
+Access Pokémon storage
 Opens the Pokémon storage boxes in Organize Boxes mode.
 Opens the Pokémon storage boxes in Organize Boxes mode.
-Shadow Pokémon Options...
-Shadow Pokémon Options...
+Shadow Pokémon options...
+Shadow Pokémon options...
 Snag Machine and purification.
 Snag Machine and purification.
 Toggle Snag Machine
@@ -5456,8 +5456,8 @@ Gave the Snag Machine.
 Gave the Snag Machine.
 Lost the Snag Machine.
 Lost the Snag Machine.
-Toggle Purify Chamber Access
-Toggle Purify Chamber Access
+Toggle Purify Chamber access
+Toggle Purify Chamber access
 Toggle access to the Purify Chamber via the PC.
 Toggle access to the Purify Chamber via the PC.
 The Purify Chamber is accessible.
@@ -5472,12 +5472,12 @@ Use Relic Stone
 Use Relic Stone
 Choose a Shadow Pokémon to show to the Relic Stone for purification.
 Choose a Shadow Pokémon to show to the Relic Stone for purification.
-Item Options...
-Item Options...
+Item options...
+Item options...
 Give and take items.
 Give and take items.
-Add Item
-Add Item
+Add item
+Add item
 Choose an item and a quantity of it to add to the Bag.
 Choose an item and a quantity of it to add to the Bag.
 ADD ITEM
@@ -5500,12 +5500,12 @@ Remove all items from the Bag.
 Remove all items from the Bag.
 The Bag was cleared.
 The Bag was cleared.
-Player Options...
-Player Options...
+Player options...
+Player options...
 Set money, badges, Pokédexes, player's appearance and name, etc.
 Set money, badges, Pokédexes, player's appearance and name, etc.
-Set Money
-Set Money
+Set money
+Set money
 Edit how much money, Game Corner Coins and Battle Points you have.
 Edit how much money, Game Corner Coins and Battle Points you have.
 Money: ${1}
@@ -5518,8 +5518,8 @@ Set the player's Coin amount.
 Set the player's Coin amount.
 Set the player's BP amount.
 Set the player's BP amount.
-Set Badges
-Set Badges
+Set Gym Badges
+Set Gym Badges
 Toggle possession of each Gym Badge.
 Toggle possession of each Gym Badge.
 Give all
@@ -5528,16 +5528,16 @@ Remove all
 Remove all
 Badge {1}
 Badge {1}
-Toggle Running Shoes
-Toggle Running Shoes
+Toggle running shoes
+Toggle running shoes
 Toggle possession of running shoes.
 Toggle possession of running shoes.
 Gave Running Shoes.
 Gave Running Shoes.
 Lost Running Shoes.
 Lost Running Shoes.
-Toggle Pokédex and Dexes
-Toggle Pokédex and Dexes
+Toggle Pokédex and Regional Dexes
+Toggle Pokédex and Regional Dexes
 Toggle possession of the Pokédex, and edit Regional Dex accessibility.
 Toggle possession of the Pokédex, and edit Regional Dex accessibility.
 Have Pokédex: {1}
@@ -5550,8 +5550,8 @@ Gave Pokégear.
 Gave Pokégear.
 Lost Pokégear.
 Lost Pokégear.
-Edit Phone And Contacts
-Edit Phone And Contacts
+Edit phone and contacts
+Edit phone and contacts
 Edit properties of the phone and of contacts registered in it.
 Edit properties of the phone and of contacts registered in it.
 The phone is not defined.
@@ -5584,32 +5584,32 @@ Set the time (in minutes) until this trainer is ready to battle.
 Set the time (in minutes) until this trainer is ready to battle.
 Set the last defeated version number of this trainer.
 Set the last defeated version number of this trainer.
-Toggle Party Screen Access To Storage
-Toggle Party Screen Access To Storage
+Toggle access to storage from party screen
+Toggle access to storage from party screen
 Toggle Box Link's effect of accessing Pokémon storage via the party screen.
 Toggle Box Link's effect of accessing Pokémon storage via the party screen.
 Enabled access to storage from the party screen.
 Enabled access to storage from the party screen.
 Disabled access to storage from the party screen.
 Disabled access to storage from the party screen.
-Set Player Character
-Set Player Character
+Set player character
+Set player character
 Edit the player's character, as defined in "metadata.txt".
 Edit the player's character, as defined in "metadata.txt".
 There is only one player character defined.
 There is only one player character defined.
 The player character was changed.
 The player character was changed.
-Set Player Outfit
-Set Player Outfit
+Set player outfit
+Set player outfit
 Edit the player's outfit number.
 Edit the player's outfit number.
 Set the player's outfit.
 Set the player's outfit.
 Player's outfit was changed.
 Player's outfit was changed.
-Set Player Name
-Set Player Name
+Set player name
+Set player name
 Rename the player.
 Rename the player.
 Give yourself a default name?
@@ -5618,14 +5618,14 @@ The player's name remained {1}.
 The player's name remained {1}.
 The player's name was changed to {1}.
 The player's name was changed to {1}.
-Randomize Player ID
-Randomize Player ID
+Randomize player ID
+Randomize player ID
 Generate a random new ID for the player.
 Generate a random new ID for the player.
 The player's ID was changed to {1} (full ID: {2}).
 The player's ID was changed to {1} (full ID: {2}).
-PBS File Editors...
-PBS File Editors...
+PBS file editors...
+PBS file editors...
 Edit information in the PBS files.
 Edit information in the PBS files.
 Edit map_connections.txt
@@ -5664,8 +5664,8 @@ Edit pokemon_metrics.txt
 Edit pokemon_metrics.txt
 Reposition Pokémon sprites in battle.
 Reposition Pokémon sprites in battle.
-Auto-Set pokemon_metrics.txts
-Auto-Set pokemon_metrics.txts
+Auto-set pokemon_metrics.txts
+Auto-set pokemon_metrics.txts
 Automatically reposition all Pokémon sprites in battle. Don't use lightly.
 Automatically reposition all Pokémon sprites in battle. Don't use lightly.
 Are you sure you want to reposition all sprites?
@@ -5676,62 +5676,62 @@ Edit regional_dexes.txt
 Edit regional_dexes.txt
 Create, rearrange and delete Regional Pokédex lists.
 Create, rearrange and delete Regional Pokédex lists.
-Other Editors...
-Other Editors...
+Other editors...
+Other editors...
 Edit battle animations, terrain tags, map data, etc.
 Edit battle animations, terrain tags, map data, etc.
-Battle Animation Editor
-Battle Animation Editor
+Battle animation editor
+Battle animation editor
 Edit the battle animations.
 Edit the battle animations.
-Battle Animation Organiser
-Battle Animation Organiser
+Battle animation organiser
+Battle animation organiser
 Rearrange/add/delete battle animations.
 Rearrange/add/delete battle animations.
-Import All Battle Animations
-Import All Battle Animations
+Import all battle animations
+Import all battle animations
 Import all battle animations from the "Animations" folder.
 Import all battle animations from the "Animations" folder.
-Export All Battle Animations
-Export All Battle Animations
+Export all battle animations
+Export all battle animations
 Export all battle animations individually to the "Animations" folder.
 Export all battle animations individually to the "Animations" folder.
-Edit Terrain Tags
-Edit Terrain Tags
+Edit terrain tags
+Edit terrain tags
 Edit the terrain tags of tiles in tilesets. Required for tags 8+.
 Edit the terrain tags of tiles in tilesets. Required for tags 8+.
-Fix Invalid Tiles
-Fix Invalid Tiles
+Fix invalid tiles
+Fix invalid tiles
 Scans all maps and erases non-existent tiles.
 Scans all maps and erases non-existent tiles.
-Files Options...
-Files Options...
+Files options...
+Files options...
 Compile, generate PBS files, translations, Mystery Gifts, etc.
 Compile, generate PBS files, translations, Mystery Gifts, etc.
-Compile Data
-Compile Data
+Compile data
+Compile data
 Fully compile all data.
 Fully compile all data.
 All game data was compiled.
 All game data was compiled.
-Create PBS File(s)
-Create PBS File(s)
+Create PBS file(s)
+Create PBS file(s)
 Choose one or all PBS files and create it.
 Choose one or all PBS files and create it.
 <<[>>Create all<<]>>
 <<[>>Create all<<]>>
 File written.
 File written.
-Rename Outdated Files
-Rename Outdated Files
+Rename outdated files
+Rename outdated files
 Check for files with outdated names and rename/move them. Can alter map data.
 Check for files with outdated names and rename/move them. Can alter map data.
 Are you sure you want to automatically rename outdated files?
 Are you sure you want to automatically rename outdated files?
 Done.
 Done.
-Extract Text For Translation
-Extract Text For Translation
+Extract text for translation
+Extract text for translation
 Extract all text in the game to text files for translating.
 Extract all text in the game to text files for translating.
 No languages are defined in the LANGUAGES array in Settings.
@@ -5750,8 +5750,8 @@ One big file
 One big file
 One file per map
 One file per map
-Compile Translated Text
-Compile Translated Text
+Compile translated text
+Compile translated text
 Import text files and convert them into a language file.
 Import text files and convert them into a language file.
 No language folders found to compile.
@@ -5764,8 +5764,8 @@ Manage Mystery Gifts
 Manage Mystery Gifts
 Edit and enable/disable Mystery Gifts.
 Edit and enable/disable Mystery Gifts.
-Reload System Cache
-Reload System Cache
+Reload system cache
+Reload system cache
 Refreshes the system's file cache. Use if you change a file while playing.
 Refreshes the system's file cache. Use if you change a file while playing.
 WARP TO MAP
@@ -5860,22 +5860,22 @@ Battlers...
 Battlers...
 Look at Pokémon in battle and change their properties.
 Look at Pokémon in battle and change their properties.
-Player-Side Battlers
-Player-Side Battlers
+Player-side battlers
+Player-side battlers
 Edit Pokémon on the player's side of battle.
 Edit Pokémon on the player's side of battle.
-Foe-Side Battlers
-Foe-Side Battlers
+Foe-side battlers
+Foe-side battlers
 Edit Pokémon on the opposing side of battle.
 Edit Pokémon on the opposing side of battle.
-Battler Speed Order
-Battler Speed Order
+View battler speed order
+View battler speed order
 Show all battlers in order from fastest to slowest.
 Show all battlers in order from fastest to slowest.
 Battlers are listed from fastest to slowest. Speeds include modifiers.
 Battlers are listed from fastest to slowest. Speeds include modifiers.
-Pokémon Teams
-Pokémon Teams
+Pokémon teams
+Pokémon teams
 Look at and edit all Pokémon in each team.
 Look at and edit all Pokémon in each team.
 Opponent {1}: {2} ({3} Pokémon)
@@ -5888,12 +5888,12 @@ Ally {1}: {2} ({3} Pokémon)
 Ally {1}: {2} ({3} Pokémon)
 Choose a team.
 Choose a team.
-Trainer Options...
-Trainer Options...
+Trainer options...
+Trainer options...
 Variables that apply to trainers.
 Variables that apply to trainers.
-NPC Trainer Items
-NPC Trainer Items
+NPC trainer items
+NPC trainer items
 View and change the items each NPC trainer has access to.
 View and change the items each NPC trainer has access to.
 Opponent {1}: {2} ({3} items)
@@ -5910,8 +5910,8 @@ Whether each trainer is allowed to Mega Evolve.
 Whether each trainer is allowed to Mega Evolve.
 Choose trainer to toggle whether they can Mega Evolve.
 Choose trainer to toggle whether they can Mega Evolve.
-Field Effects...
-Field Effects...
+Field effects...
+Field effects...
 Effects that apply to the whole battlefield.
 Effects that apply to the whole battlefield.
 Weather
@@ -5950,8 +5950,8 @@ There is no terrain.
 There is no terrain.
 Choose the new terrain duration (0=infinite).
 Choose the new terrain duration (0=infinite).
-Environment/Time
-Environment/Time
+Environment/time
+Environment/time
 Set the battle's environment and time of day.
 Set the battle's environment and time of day.
 Environment: {1}
@@ -5972,8 +5972,8 @@ Choose the new environment.
 Choose the new environment.
 Choose the new time.
 Choose the new time.
-Backdrop Names
-Backdrop Names
+Backdrop names
+Backdrop names
 Set the names of the backdrop and base graphics.
 Set the names of the backdrop and base graphics.
 Set which backdrop name?
@@ -5986,20 +5986,20 @@ Set the backdrop's name.
 Set the backdrop's name.
 Set the base modifier text.
 Set the base modifier text.
-Other Field Effects...
-Other Field Effects...
+Other field effects...
+Other field effects...
 View/set other effects that apply to the whole battlefield.
 View/set other effects that apply to the whole battlefield.
-Player's Side Effects...
-Player's Side Effects...
+Player's side effects...
+Player's side effects...
 Effects that apply to the side the player is on.
 Effects that apply to the side the player is on.
-Foe's Side Effects...
-Foe's Side Effects...
+Foe's side effects...
+Foe's side effects...
 Effects that apply to the opposing side.
 Effects that apply to the opposing side.
-Battler Position Effects...
-Battler Position Effects...
+Battler position effects...
+Battler position effects...
 Effects that apply to individual battler positions.
 Effects that apply to individual battler positions.
 (empty)
@@ -6012,8 +6012,8 @@ Effects that apply to individual battler positions.
 (ally's)
 Choose a battler position.
 Choose a battler position.
-HP/Status...
-HP/Status...
+HP/status...
+HP/status...
 Set HP
 Set HP
 {1} is an egg.
@@ -6264,8 +6264,8 @@ Clear Pokérus
 Clear Pokérus
 Level/stats...
 Level/stats...
-EV/IV/pID...
-EV/IV/pID...
+EV/IV/personal ID...
+EV/IV/personal ID...
 Personal ID is {1}.
 Personal ID is {1}.
 Randomise pID
--- a/mkxp.json
+++ b/mkxp.json
@@ -20,10 +20,6 @@
    "defScreenW": 512,
    "defScreenH": 384,

-    // The game's frame rate.
-    //
-    "fixedFramerate": 61,
-
    // The path to the game window's icon. For Linux only. (Default: none)
    //
    // "iconPath": "/path/to/icon.png",
@@ -149,6 +145,10 @@
    //
    "vsync": true,

+    // The game's frame rate.
+    //
+    "fixedFramerate": 61,
+
    // Use a fixed framerate that is approx. equal to the native screen refresh
    // rate. This is different from "fixedFramerate" because the actual frame
    // rate is reported back to the game, ensuring correct timers. If the screen