From 710bcdee3b421271a05cdf0db12f73659ede7054 Mon Sep 17 00:00:00 2001
From: Espyo <andreluis.g.silva@gmail.com>
Date: Sun, 22 Dec 2024 23:34:17 +0000
Subject: [PATCH] Minor tweaks to the text boxes in the "new" dialogs.

---
 game_data/base/hazards/crush.txt                           | 2 +-
 game_data/base/hazards/explosion.txt                       | 2 +-
 game_data/base/hazards/fatal_electricity.txt               | 2 +-
 game_data/base/hazards/fire.txt                            | 2 +-
 game_data/base/hazards/ink.txt                             | 2 +-
 game_data/base/hazards/poison.txt                          | 2 +-
 game_data/base/hazards/rock.txt                            | 2 +-
 game_data/base/hazards/stab.txt                            | 2 +-
 game_data/base/hazards/stunning_electricity.txt            | 2 +-
 game_data/base/hazards/water.txt                           | 2 +-
 game_data/base/hazards/water_bubble.txt                    | 2 +-
 game_data/base/hazards/wind.txt                            | 2 +-
 game_data/base/liquids/water.txt                           | 2 +-
 .../base/particle_generators/beady_long_legs_crumbling.txt | 2 +-
 game_data/base/particle_generators/blowhog_wind.txt        | 2 +-
 .../base/particle_generators/bramble_gate_explosion.txt    | 2 +-
 .../base/particle_generators/bridge_dust_explosion.txt     | 2 +-
 .../base/particle_generators/bubble_explosion_small.txt    | 2 +-
 .../bubble_explosion_small_continuous.txt                  | 2 +-
 game_data/base/particle_generators/bubble_hazard.txt       | 2 +-
 .../base/particle_generators/bubble_placement_small.txt    | 2 +-
 game_data/base/particle_generators/cardboard_box_dust.txt  | 2 +-
 .../base/particle_generators/crystal_wall_explosion.txt    | 2 +-
 .../base/particle_generators/dark_smoke_explosion.txt      | 2 +-
 game_data/base/particle_generators/dust.txt                | 2 +-
 game_data/base/particle_generators/dust_explosion.txt      | 2 +-
 game_data/base/particle_generators/dust_explosion_gate.txt | 2 +-
 .../base/particle_generators/dust_explosion_large.txt      | 2 +-
 .../base/particle_generators/dust_explosion_small.txt      | 2 +-
 .../base/particle_generators/dust_pressure_plate_click.txt | 2 +-
 game_data/base/particle_generators/dust_spit.txt           | 2 +-
 .../base/particle_generators/dweevil_treasure_release.txt  | 2 +-
 game_data/base/particle_generators/egg_shard_explosion.txt | 2 +-
 .../base/particle_generators/electric_gate_explosion.txt   | 2 +-
 .../base/particle_generators/electrical_wire_sparks.txt    | 2 +-
 game_data/base/particle_generators/explosion_crater.txt    | 2 +-
 game_data/base/particle_generators/falling_dirt.txt        | 2 +-
 game_data/base/particle_generators/fire_geyser_smoke.txt   | 2 +-
 game_data/base/particle_generators/flare.txt               | 2 +-
 game_data/base/particle_generators/gas_explosion.txt       | 2 +-
 game_data/base/particle_generators/gas_pipe.txt            | 2 +-
 game_data/base/particle_generators/geyser.txt              | 2 +-
 .../base/particle_generators/large_crystal_explosion.txt   | 2 +-
 .../base/particle_generators/large_rock_explosion.txt      | 2 +-
 game_data/base/particle_generators/large_smoke.txt         | 2 +-
 game_data/base/particle_generators/paper_bag_dust.txt      | 2 +-
 .../base/particle_generators/pellet_posy_10_petals.txt     | 2 +-
 .../base/particle_generators/pellet_posy_1_petals.txt      | 2 +-
 .../base/particle_generators/pellet_posy_20_petals.txt     | 2 +-
 .../base/particle_generators/pellet_posy_5_petals.txt      | 2 +-
 game_data/base/particle_generators/petrification_crack.txt | 2 +-
 game_data/base/particle_generators/poison_gas.txt          | 2 +-
 game_data/base/particle_generators/purple_pikmin_pound.txt | 2 +-
 .../base/particle_generators/reinforced_wall_explosion.txt | 2 +-
 game_data/base/particle_generators/rock_explosion.txt      | 2 +-
 game_data/base/particle_generators/shockwave.txt           | 2 +-
 .../base/particle_generators/small_crystal_explosion.txt   | 2 +-
 game_data/base/particle_generators/small_sparks.txt        | 2 +-
 game_data/base/particle_generators/smoke.txt               | 2 +-
 game_data/base/particle_generators/smoke_explosion.txt     | 2 +-
 game_data/base/particle_generators/spark_explosion.txt     | 2 +-
 game_data/base/particle_generators/spicy_sparkles.txt      | 2 +-
 .../base/particle_generators/spore_explosion_small.txt     | 2 +-
 game_data/base/particle_generators/steam.txt               | 2 +-
 game_data/base/particle_generators/white_pikmin_poison.txt | 2 +-
 game_data/base/spike_damage_types/bomb_rock_explosion.txt  | 2 +-
 game_data/base/spike_damage_types/poison.txt               | 2 +-
 game_data/base/statuses/bomb_rock_health_drain.txt         | 2 +-
 game_data/base/statuses/bubbled.txt                        | 2 +-
 game_data/base/statuses/burned.txt                         | 2 +-
 game_data/base/statuses/crushed.txt                        | 2 +-
 game_data/base/statuses/double_speed.txt                   | 2 +-
 game_data/base/statuses/drowning.txt                       | 2 +-
 game_data/base/statuses/dweevil_with_treasure.txt          | 2 +-
 game_data/base/statuses/electrocuted.txt                   | 2 +-
 game_data/base/statuses/inked.txt                          | 2 +-
 game_data/base/statuses/petrified.txt                      | 2 +-
 game_data/base/statuses/petrified_cracked.txt              | 2 +-
 game_data/base/statuses/petrified_cracking.txt             | 2 +-
 game_data/base/statuses/poisoned.txt                       | 2 +-
 game_data/base/statuses/rock_pressed.txt                   | 2 +-
 game_data/base/statuses/shocked.txt                        | 2 +-
 game_data/base/statuses/spicy.txt                          | 2 +-
 game_data/base/statuses/triple_speed.txt                   | 2 +-
 game_data/base/statuses/white_pikmin_poison.txt            | 2 +-
 source/documents/todo.txt                                  | 5 +++--
 source/source/game_states/animation_editor/editor.h        | 2 +-
 source/source/game_states/animation_editor/gui.cpp         | 7 +++++--
 source/source/game_states/area_editor/editor.h             | 2 +-
 source/source/game_states/area_editor/gui.cpp              | 5 ++++-
 source/source/game_states/editor.cpp                       | 7 +++++--
 91 files changed, 104 insertions(+), 94 deletions(-)

diff --git a/game_data/base/hazards/crush.txt b/game_data/base/hazards/crush.txt
index 0564bc290..8ddfc1db1 100644
--- a/game_data/base/hazards/crush.txt
+++ b/game_data/base/hazards/crush.txt
@@ -1,4 +1,4 @@
-name = crush
+name = Crush
 description = The damage of being crushed under something heavy. Used, for instance, by a Yellow Wollyog's stomping attack.
 
 color = 0 0 0
diff --git a/game_data/base/hazards/explosion.txt b/game_data/base/hazards/explosion.txt
index a2c49c633..b0a716041 100644
--- a/game_data/base/hazards/explosion.txt
+++ b/game_data/base/hazards/explosion.txt
@@ -1,4 +1,4 @@
-name = explosion
+name = Explosion
 description = Any sort of explosive force. Explosions are usually powerful enough to cause damage to even obstacles. Used, for instance, by bomb rock explosions.
 
 color = 255 128 0
diff --git a/game_data/base/hazards/fatal_electricity.txt b/game_data/base/hazards/fatal_electricity.txt
index 0a0ca0610..d3d11c63c 100644
--- a/game_data/base/hazards/fatal_electricity.txt
+++ b/game_data/base/hazards/fatal_electricity.txt
@@ -1,4 +1,4 @@
-name = fatal_electricity
+name = Fatal electricity
 description = Powerful eletrical current that eletrocutes the victim, killing them. Used, for instance, by an electrical wire's electricity arc.
 
 color = 255 255 128
diff --git a/game_data/base/hazards/fire.txt b/game_data/base/hazards/fire.txt
index 33baefc3c..57a4d2e17 100644
--- a/game_data/base/hazards/fire.txt
+++ b/game_data/base/hazards/fire.txt
@@ -1,4 +1,4 @@
-name = fire
+name = Fire
 description = Fire, and really, anything that burns. Typically makes a Pikmin's top catch on fire. Used, for instance, by a Fiery Blowhog's fire breath attack.
 
 color = 255 0 0
diff --git a/game_data/base/hazards/ink.txt b/game_data/base/hazards/ink.txt
index 30bf489be..e3c03425a 100644
--- a/game_data/base/hazards/ink.txt
+++ b/game_data/base/hazards/ink.txt
@@ -1,4 +1,4 @@
-name = ink
+name = Ink
 description = Globs of ink that obscure a Pikmin's top and send it into a temporary panic. Used, for instance, by a Toady Bloyster's ink spray attack.
 
 color = 64 64 64
diff --git a/game_data/base/hazards/poison.txt b/game_data/base/hazards/poison.txt
index 6261f57be..8e8a5f4b3 100644
--- a/game_data/base/hazards/poison.txt
+++ b/game_data/base/hazards/poison.txt
@@ -1,4 +1,4 @@
-name = poison
+name = Poison
 description = Poison gas that chokes a Pikmin's top, causing it to suffocate. Used, for instance, by a Munge Dweevil's gas explosion attack.
 
 color = 128 16 112
diff --git a/game_data/base/hazards/rock.txt b/game_data/base/hazards/rock.txt
index f75ac4cb2..76f817bee 100644
--- a/game_data/base/hazards/rock.txt
+++ b/game_data/base/hazards/rock.txt
@@ -1,4 +1,4 @@
-name = rock
+name = Rock
 description = The impact of a thrown rock colliding against something, like a Rock Pikmin. Effective against crystals.
 
 color = 160 160 160
diff --git a/game_data/base/hazards/stab.txt b/game_data/base/hazards/stab.txt
index 27683ea85..14d5db393 100644
--- a/game_data/base/hazards/stab.txt
+++ b/game_data/base/hazards/stab.txt
@@ -1,4 +1,4 @@
-name = stab
+name = Stab
 description = The force necessary to pierce through something that's too fleshy to resist. Used, for example, by a Cloaking Burrow-nit's stab attack.
 
 color = 0 0 0
diff --git a/game_data/base/hazards/stunning_electricity.txt b/game_data/base/hazards/stunning_electricity.txt
index 028c4c27d..cff0f3ca2 100644
--- a/game_data/base/hazards/stunning_electricity.txt
+++ b/game_data/base/hazards/stunning_electricity.txt
@@ -1,4 +1,4 @@
-name = stunning_electricity
+name = Stunning electricity
 description = Small currents of electricity that aren't harmful, but paralize Pikmin. Used, for instance, by an Electric Water Dumple's zapping attack.
 
 color = 255 255 128
diff --git a/game_data/base/hazards/water.txt b/game_data/base/hazards/water.txt
index 6f8d04782..7a07d78e7 100644
--- a/game_data/base/hazards/water.txt
+++ b/game_data/base/hazards/water.txt
@@ -1,4 +1,4 @@
-name = water
+name = Water
 description = Any body of water on the floor. Pikmin that cannot swim will start struggling and eventually drown.
 
 color = 0 0 255
diff --git a/game_data/base/hazards/water_bubble.txt b/game_data/base/hazards/water_bubble.txt
index 17b527448..b525ddaae 100644
--- a/game_data/base/hazards/water_bubble.txt
+++ b/game_data/base/hazards/water_bubble.txt
@@ -1,4 +1,4 @@
-name = water_bubble
+name = Water bubble
 description = A bubble of water that can wrap itself around a Pikmin's top and cause it to suffocate. Used, for instance, by a Caustic Dweevil's water splash attack.
 
 color = 0 255 255
diff --git a/game_data/base/hazards/wind.txt b/game_data/base/hazards/wind.txt
index a54906d1a..b04948852 100644
--- a/game_data/base/hazards/wind.txt
+++ b/game_data/base/hazards/wind.txt
@@ -1,4 +1,4 @@
-name = wind
+name = Wind
 description = Any strong gust of wind that can push lighter Pikmin around and knock them off their feet. Used, for instance, by a Puffy Blowhog's wind attack.
 
 color = 255 255 255
diff --git a/game_data/base/liquids/water.txt b/game_data/base/liquids/water.txt
index 5625cbf27..61753d9f6 100644
--- a/game_data/base/liquids/water.txt
+++ b/game_data/base/liquids/water.txt
@@ -1,4 +1,4 @@
-name = water
+name = Water
 description = Everyday body of water.
 
 animation = water
diff --git a/game_data/base/particle_generators/beady_long_legs_crumbling.txt b/game_data/base/particle_generators/beady_long_legs_crumbling.txt
index cf889c8c0..e1bdd01f8 100644
--- a/game_data/base/particle_generators/beady_long_legs_crumbling.txt
+++ b/game_data/base/particle_generators/beady_long_legs_crumbling.txt
@@ -1,4 +1,4 @@
-name = beady_long_legs_crumbling
+name = Beady Long Legs crumbling
 description = The flakes dropped by a crumbling Beady Long Legs.
 
 emission_interval = 0.05
diff --git a/game_data/base/particle_generators/blowhog_wind.txt b/game_data/base/particle_generators/blowhog_wind.txt
index 498f9f3d0..4e538a343 100644
--- a/game_data/base/particle_generators/blowhog_wind.txt
+++ b/game_data/base/particle_generators/blowhog_wind.txt
@@ -1,4 +1,4 @@
-name = blowhog_wind
+name = Blowhog wind
 description = Wind blown in a circle outwards, caused when a Puffy Blowhog's wind blowing attack hits the floor.
 
 emission_interval = 0.1
diff --git a/game_data/base/particle_generators/bramble_gate_explosion.txt b/game_data/base/particle_generators/bramble_gate_explosion.txt
index 57969d937..43845a0b3 100644
--- a/game_data/base/particle_generators/bramble_gate_explosion.txt
+++ b/game_data/base/particle_generators/bramble_gate_explosion.txt
@@ -1,4 +1,4 @@
-name = bramble_gate_explosion
+name = Bramble gate explosion
 description = A bramble gate blowing in a dust of debris after being completely destroyed.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/bridge_dust_explosion.txt b/game_data/base/particle_generators/bridge_dust_explosion.txt
index 8c243c4bb..20fd19a3a 100644
--- a/game_data/base/particle_generators/bridge_dust_explosion.txt
+++ b/game_data/base/particle_generators/bridge_dust_explosion.txt
@@ -1,4 +1,4 @@
-name = bridge_dust_explosion
+name = Bridge dust explosion
 description = An explosion of dust from a wood bridge's chunk being created.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/bubble_explosion_small.txt b/game_data/base/particle_generators/bubble_explosion_small.txt
index 67593663c..81b955de5 100644
--- a/game_data/base/particle_generators/bubble_explosion_small.txt
+++ b/game_data/base/particle_generators/bubble_explosion_small.txt
@@ -1,4 +1,4 @@
-name = bubble_explosion_small
+name = Bubble explosion (small)
 description = A generic small explosion of bubbles. Used, for instance, when the Cyclopod dies.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/bubble_explosion_small_continuous.txt b/game_data/base/particle_generators/bubble_explosion_small_continuous.txt
index 5d0f02f35..93a3548e5 100644
--- a/game_data/base/particle_generators/bubble_explosion_small_continuous.txt
+++ b/game_data/base/particle_generators/bubble_explosion_small_continuous.txt
@@ -1,4 +1,4 @@
-name = bubble_explosion_small_continuous
+name = Bubble explosion (small, continuous)
 description = A generic small continuous explosion of bubbles. Used, for instance, when the Cyclopod is spinning.
 
 emission_interval = 0.1
diff --git a/game_data/base/particle_generators/bubble_hazard.txt b/game_data/base/particle_generators/bubble_hazard.txt
index 630acd4d6..1b8221570 100644
--- a/game_data/base/particle_generators/bubble_hazard.txt
+++ b/game_data/base/particle_generators/bubble_hazard.txt
@@ -1,4 +1,4 @@
-name = bubble_hazard
+name = Bubble hazard
 description = Small bubbles that come out of Pikmin tops periodically, indicating they are suffocating from a bubble of water.
 
 emission_interval = 0.1
diff --git a/game_data/base/particle_generators/bubble_placement_small.txt b/game_data/base/particle_generators/bubble_placement_small.txt
index 15c1744de..eedb89ff6 100644
--- a/game_data/base/particle_generators/bubble_placement_small.txt
+++ b/game_data/base/particle_generators/bubble_placement_small.txt
@@ -1,4 +1,4 @@
-name = bubble_placement_small
+name = Bubble placement (small)
 description = A generic patch of small bubbles placed in place. Used, for instance, when the Cyclopod is swimming.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/cardboard_box_dust.txt b/game_data/base/particle_generators/cardboard_box_dust.txt
index b9a4e3475..2fc72239f 100644
--- a/game_data/base/particle_generators/cardboard_box_dust.txt
+++ b/game_data/base/particle_generators/cardboard_box_dust.txt
@@ -1,4 +1,4 @@
-name = cardboard_box_dust
+name = Cardboard box dust
 description = The dust spread to the air by a cardboard box that's being dragged.
 
 emission_interval = 0.06
diff --git a/game_data/base/particle_generators/crystal_wall_explosion.txt b/game_data/base/particle_generators/crystal_wall_explosion.txt
index 1e21297c3..ca116774d 100644
--- a/game_data/base/particle_generators/crystal_wall_explosion.txt
+++ b/game_data/base/particle_generators/crystal_wall_explosion.txt
@@ -1,4 +1,4 @@
-name = crystal_wall_explosion
+name = Crystal wall explosion
 description = An explosion of small shards that a crystal wall breaks into when completely destroyed.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/dark_smoke_explosion.txt b/game_data/base/particle_generators/dark_smoke_explosion.txt
index 0363710b1..87d8d2ead 100644
--- a/game_data/base/particle_generators/dark_smoke_explosion.txt
+++ b/game_data/base/particle_generators/dark_smoke_explosion.txt
@@ -1,4 +1,4 @@
-name = dark_smoke_explosion
+name = Dark smoke explosion
 description = A generic explosion of dark smoke. Used, for instance, when a bomb rock is ingested and blows up inside an enemy.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/dust.txt b/game_data/base/particle_generators/dust.txt
index db22c6224..b5e266aa6 100644
--- a/game_data/base/particle_generators/dust.txt
+++ b/game_data/base/particle_generators/dust.txt
@@ -1,4 +1,4 @@
-name = dust
+name = Dust
 description = Generic puffs of dust being lifted to the air in place. Used, for instance, by the trail left behind a rolling boulder.
 
 emission_interval = 0.06
diff --git a/game_data/base/particle_generators/dust_explosion.txt b/game_data/base/particle_generators/dust_explosion.txt
index 33ef0dc9a..79701fe8c 100644
--- a/game_data/base/particle_generators/dust_explosion.txt
+++ b/game_data/base/particle_generators/dust_explosion.txt
@@ -1,4 +1,4 @@
-name = dust_explosion
+name = Dust explosion
 description = A generic mid-sized explosion of dust. Used, for instance, when a Beady Long Legs stomps its foot.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/dust_explosion_gate.txt b/game_data/base/particle_generators/dust_explosion_gate.txt
index 0a632719f..e2fcd1665 100644
--- a/game_data/base/particle_generators/dust_explosion_gate.txt
+++ b/game_data/base/particle_generators/dust_explosion_gate.txt
@@ -1,4 +1,4 @@
-name = dust_explosion_gate
+name = Dust explosion (gate)
 description = A generic gate-sized explosion of dust. Used, for instance, when a lifted gate lands.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/dust_explosion_large.txt b/game_data/base/particle_generators/dust_explosion_large.txt
index 50db62f78..29e6bd1dd 100644
--- a/game_data/base/particle_generators/dust_explosion_large.txt
+++ b/game_data/base/particle_generators/dust_explosion_large.txt
@@ -1,4 +1,4 @@
-name = dust_explosion_large
+name = Dust explosion (large)
 description = A generic large explosion of dust. Used, for instance, when the Puffy Blowhog falls to the ground.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/dust_explosion_small.txt b/game_data/base/particle_generators/dust_explosion_small.txt
index e2ceb8433..780706652 100644
--- a/game_data/base/particle_generators/dust_explosion_small.txt
+++ b/game_data/base/particle_generators/dust_explosion_small.txt
@@ -1,4 +1,4 @@
-name = dust_explosion_small
+name = Dust explosion (small)
 description = A generic small explosion of dust. Used, for instance, when a ceramic bridge's fragment pops into place.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/dust_pressure_plate_click.txt b/game_data/base/particle_generators/dust_pressure_plate_click.txt
index 42742e4fc..2507f181f 100644
--- a/game_data/base/particle_generators/dust_pressure_plate_click.txt
+++ b/game_data/base/particle_generators/dust_pressure_plate_click.txt
@@ -1,4 +1,4 @@
-name = dust_pressure_plate_click
+name = Dust (pressure plate click)
 description = A quick explosion of dust. Used, for instance, when a pressure plate is pressed down.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/dust_spit.txt b/game_data/base/particle_generators/dust_spit.txt
index 9aca41737..4d2f327f2 100644
--- a/game_data/base/particle_generators/dust_spit.txt
+++ b/game_data/base/particle_generators/dust_spit.txt
@@ -1,4 +1,4 @@
-name = dust_spit
+name = Dust (spit)
 description = Some particles of dust being blown outward. Used by the Armored Cannon Beetle when it blows out a boulder.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/dweevil_treasure_release.txt b/game_data/base/particle_generators/dweevil_treasure_release.txt
index 0287fd966..cec3196eb 100644
--- a/game_data/base/particle_generators/dweevil_treasure_release.txt
+++ b/game_data/base/particle_generators/dweevil_treasure_release.txt
@@ -1,4 +1,4 @@
-name = dweevil_treasure_release
+name = Dweevil treasure release
 description = Some sparkles for when a Dweevil releases a treasure.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/egg_shard_explosion.txt b/game_data/base/particle_generators/egg_shard_explosion.txt
index a4601b598..cd0c81827 100644
--- a/game_data/base/particle_generators/egg_shard_explosion.txt
+++ b/game_data/base/particle_generators/egg_shard_explosion.txt
@@ -1,4 +1,4 @@
-name = egg_shard_explosion
+name = Egg shard explosion
 description = An explosion of shards from a recently-broken egg's shell.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/electric_gate_explosion.txt b/game_data/base/particle_generators/electric_gate_explosion.txt
index f81897c0d..3c4c2bece 100644
--- a/game_data/base/particle_generators/electric_gate_explosion.txt
+++ b/game_data/base/particle_generators/electric_gate_explosion.txt
@@ -1,4 +1,4 @@
-name = electric_gate_explosion
+name = Electric gate explosion
 description = An explosion of triangular shards representing the glass lamps of a destroyed electric gate.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/electrical_wire_sparks.txt b/game_data/base/particle_generators/electrical_wire_sparks.txt
index 512a8780f..490b07bc9 100644
--- a/game_data/base/particle_generators/electrical_wire_sparks.txt
+++ b/game_data/base/particle_generators/electrical_wire_sparks.txt
@@ -1,4 +1,4 @@
-name = electrical_wire_sparks
+name = Electrical wire sparks
 description = A series of small sparks emitted by an electrical wire that's about to start an arc of electricity.
 
 emission_interval = 0.1
diff --git a/game_data/base/particle_generators/explosion_crater.txt b/game_data/base/particle_generators/explosion_crater.txt
index c27682182..867d4d2f7 100644
--- a/game_data/base/particle_generators/explosion_crater.txt
+++ b/game_data/base/particle_generators/explosion_crater.txt
@@ -1,4 +1,4 @@
-name = explosion_crater
+name = Explosion crater
 description = A crater left behind by an explosion. It fades away with time.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/falling_dirt.txt b/game_data/base/particle_generators/falling_dirt.txt
index 655896a93..329914a44 100644
--- a/game_data/base/particle_generators/falling_dirt.txt
+++ b/game_data/base/particle_generators/falling_dirt.txt
@@ -1,4 +1,4 @@
-name = falling_dirt
+name = Falling dirt
 description = Generic particles of dirt falling down. Used, for instance, by a lifting gate.
 
 emission_interval = 0.3
diff --git a/game_data/base/particle_generators/fire_geyser_smoke.txt b/game_data/base/particle_generators/fire_geyser_smoke.txt
index 8c2f474d8..6f47a890d 100644
--- a/game_data/base/particle_generators/fire_geyser_smoke.txt
+++ b/game_data/base/particle_generators/fire_geyser_smoke.txt
@@ -1,4 +1,4 @@
-name = fire_geyser_smoke
+name = Fire geyser smoke
 description = Dark smoke shot from a fire geyser.
 
 emission_interval = 0.06
diff --git a/game_data/base/particle_generators/flare.txt b/game_data/base/particle_generators/flare.txt
index e50d7b2f7..ce11d8020 100644
--- a/game_data/base/particle_generators/flare.txt
+++ b/game_data/base/particle_generators/flare.txt
@@ -1,4 +1,4 @@
-name = flare
+name = Flare
 description = A large flare of light. Used, for instance, in explosions.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/gas_explosion.txt b/game_data/base/particle_generators/gas_explosion.txt
index e13e79970..e5e4d0aff 100644
--- a/game_data/base/particle_generators/gas_explosion.txt
+++ b/game_data/base/particle_generators/gas_explosion.txt
@@ -1,4 +1,4 @@
-name = gas_explosion
+name = Gas explosion
 description = A generic explosion of poison gas. Used, for instance, by the Munge Dweevil when attacking.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/gas_pipe.txt b/game_data/base/particle_generators/gas_pipe.txt
index 3fda791f8..88f0f7aee 100644
--- a/game_data/base/particle_generators/gas_pipe.txt
+++ b/game_data/base/particle_generators/gas_pipe.txt
@@ -1,4 +1,4 @@
-name = gas_pipe
+name = Gas pipe
 description = A continuous stream of poison gas in every direction, emitted by a gas pipe.
 
 emission_interval = 0.3
diff --git a/game_data/base/particle_generators/geyser.txt b/game_data/base/particle_generators/geyser.txt
index f987d4141..7dae4d112 100644
--- a/game_data/base/particle_generators/geyser.txt
+++ b/game_data/base/particle_generators/geyser.txt
@@ -1,4 +1,4 @@
-name = geyser
+name = Geyser
 description = Particles emitted by an active geyser.
 
 emission_interval = 0.4
diff --git a/game_data/base/particle_generators/large_crystal_explosion.txt b/game_data/base/particle_generators/large_crystal_explosion.txt
index 9db3914ed..f40ae4b67 100644
--- a/game_data/base/particle_generators/large_crystal_explosion.txt
+++ b/game_data/base/particle_generators/large_crystal_explosion.txt
@@ -1,4 +1,4 @@
-name = large_crystal_explosion
+name = Large crystal explosion
 description = A large explosion of crystal shards, used when a large crystal is destroyed.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/large_rock_explosion.txt b/game_data/base/particle_generators/large_rock_explosion.txt
index 490fd8cc2..2838e4b5d 100644
--- a/game_data/base/particle_generators/large_rock_explosion.txt
+++ b/game_data/base/particle_generators/large_rock_explosion.txt
@@ -1,4 +1,4 @@
-name = large_rock_explosion
+name = Large rock explosion
 description = A large explosion of rock particles, used when a clog is destroyed.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/large_smoke.txt b/game_data/base/particle_generators/large_smoke.txt
index b203644c0..60f5adce2 100644
--- a/game_data/base/particle_generators/large_smoke.txt
+++ b/game_data/base/particle_generators/large_smoke.txt
@@ -1,4 +1,4 @@
-name = large_smoke
+name = Large smoke
 description = Large variant of smoke particle
 
 emission_interval = 0.2
diff --git a/game_data/base/particle_generators/paper_bag_dust.txt b/game_data/base/particle_generators/paper_bag_dust.txt
index 9f7cef33c..50e6c6ff2 100644
--- a/game_data/base/particle_generators/paper_bag_dust.txt
+++ b/game_data/base/particle_generators/paper_bag_dust.txt
@@ -1,4 +1,4 @@
-name = paper_bag_dust
+name = Paper bag dust
 description = Random particles of dust thrown to the air by a paper bag that's being crushed down.
 
 emission_interval = 0.08
diff --git a/game_data/base/particle_generators/pellet_posy_10_petals.txt b/game_data/base/particle_generators/pellet_posy_10_petals.txt
index bc377798d..e52f1153c 100644
--- a/game_data/base/particle_generators/pellet_posy_10_petals.txt
+++ b/game_data/base/particle_generators/pellet_posy_10_petals.txt
@@ -1,4 +1,4 @@
-name = pellet_posy_10_petals
+name = Pellet Posy 10 petals
 description = A small burst of petals from a 10 pellet Pellet Posy.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/pellet_posy_1_petals.txt b/game_data/base/particle_generators/pellet_posy_1_petals.txt
index b21e67925..3d1c64da5 100644
--- a/game_data/base/particle_generators/pellet_posy_1_petals.txt
+++ b/game_data/base/particle_generators/pellet_posy_1_petals.txt
@@ -1,4 +1,4 @@
-name = pellet_posy_1_petals
+name = Pellet Posy 1 petals
 description = A small burst of petals from a 1 pellet Pellet Posy.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/pellet_posy_20_petals.txt b/game_data/base/particle_generators/pellet_posy_20_petals.txt
index dea29572e..efa17f741 100644
--- a/game_data/base/particle_generators/pellet_posy_20_petals.txt
+++ b/game_data/base/particle_generators/pellet_posy_20_petals.txt
@@ -1,4 +1,4 @@
-name = pellet_posy_20_petals
+name = Pellet Posy 20 petals
 description = A small burst of petals from a 20 pellet Pellet Posy.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/pellet_posy_5_petals.txt b/game_data/base/particle_generators/pellet_posy_5_petals.txt
index 5a278f860..4449a91a7 100644
--- a/game_data/base/particle_generators/pellet_posy_5_petals.txt
+++ b/game_data/base/particle_generators/pellet_posy_5_petals.txt
@@ -1,4 +1,4 @@
-name = pellet_posy_5_petals
+name = Pellet Posy 5 petals
 description = A small burst of petals from a 5 pellet Pellet Posy.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/petrification_crack.txt b/game_data/base/particle_generators/petrification_crack.txt
index e47879725..75e9d7627 100644
--- a/game_data/base/particle_generators/petrification_crack.txt
+++ b/game_data/base/particle_generators/petrification_crack.txt
@@ -1,4 +1,4 @@
-name = petrification_crack
+name = Petrification crack
 description = A small explosion of rocks from when a petrified enemy manages to break free.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/poison_gas.txt b/game_data/base/particle_generators/poison_gas.txt
index 17721b082..b03a28371 100644
--- a/game_data/base/particle_generators/poison_gas.txt
+++ b/game_data/base/particle_generators/poison_gas.txt
@@ -1,4 +1,4 @@
-name = poison_gas
+name = Poison gas
 description = Small bursts of poison gas, signifying a Pikmin has been poisoned and is suffocating.
 
 emission_interval = 0.06
diff --git a/game_data/base/particle_generators/purple_pikmin_pound.txt b/game_data/base/particle_generators/purple_pikmin_pound.txt
index 7dcc009aa..bb6cf9822 100644
--- a/game_data/base/particle_generators/purple_pikmin_pound.txt
+++ b/game_data/base/particle_generators/purple_pikmin_pound.txt
@@ -1,4 +1,4 @@
-name = purple_pikmin_pound
+name = Purple Pikmin pound
 description = A brief explosion of dust from a Purple Pikmin landing on top of an enemy.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/reinforced_wall_explosion.txt b/game_data/base/particle_generators/reinforced_wall_explosion.txt
index 883db590c..50839ed5d 100644
--- a/game_data/base/particle_generators/reinforced_wall_explosion.txt
+++ b/game_data/base/particle_generators/reinforced_wall_explosion.txt
@@ -1,4 +1,4 @@
-name = reinforced_wall_explosion
+name = Reinforced wall explosion
 description = Explosion of pebbles launched by a recently-destroyed reinforced wall.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/rock_explosion.txt b/game_data/base/particle_generators/rock_explosion.txt
index f40527e07..e3e399eae 100644
--- a/game_data/base/particle_generators/rock_explosion.txt
+++ b/game_data/base/particle_generators/rock_explosion.txt
@@ -1,4 +1,4 @@
-name = rock_explosion
+name = Rock explosion
 description = A generic explosion of rock particles. Used, for instance, when a rolling boulder breaks.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/shockwave.txt b/game_data/base/particle_generators/shockwave.txt
index a0db5defc..8a7a06170 100644
--- a/game_data/base/particle_generators/shockwave.txt
+++ b/game_data/base/particle_generators/shockwave.txt
@@ -1,4 +1,4 @@
-name = shockwave
+name = Shockwave
 description = A shockwave that quickly grows outward and disappears. Used, for instance, in explosions.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/small_crystal_explosion.txt b/game_data/base/particle_generators/small_crystal_explosion.txt
index 82d123b77..e7dc94446 100644
--- a/game_data/base/particle_generators/small_crystal_explosion.txt
+++ b/game_data/base/particle_generators/small_crystal_explosion.txt
@@ -1,4 +1,4 @@
-name = small_crystal_explosion
+name = Small crystal explosion
 description = A small explosion of crystal shards from a recently-destroyed small crystal.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/small_sparks.txt b/game_data/base/particle_generators/small_sparks.txt
index dd131bee3..b30cffa0b 100644
--- a/game_data/base/particle_generators/small_sparks.txt
+++ b/game_data/base/particle_generators/small_sparks.txt
@@ -1,4 +1,4 @@
-name = small_sparks
+name = Small sparks
 description = A small explosion of gentle sparkles, signifying a Pellet Posy's growth.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/smoke.txt b/game_data/base/particle_generators/smoke.txt
index d88e0986f..8bde826f4 100644
--- a/game_data/base/particle_generators/smoke.txt
+++ b/game_data/base/particle_generators/smoke.txt
@@ -1,4 +1,4 @@
-name = smoke
+name = Smoke
 description = Generic dark smoke. Used, for instance, when a Pikmin is burning up.
 
 emission_interval = 0.06
diff --git a/game_data/base/particle_generators/smoke_explosion.txt b/game_data/base/particle_generators/smoke_explosion.txt
index f898e1695..91239ba0e 100644
--- a/game_data/base/particle_generators/smoke_explosion.txt
+++ b/game_data/base/particle_generators/smoke_explosion.txt
@@ -1,4 +1,4 @@
-name = smoke_explosion
+name = Smoke explosion
 description = A generic explosion of gray smoke. Used, for instance, when a bomb rock explodes.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/spark_explosion.txt b/game_data/base/particle_generators/spark_explosion.txt
index 0eaa74afe..0e3d08a4e 100644
--- a/game_data/base/particle_generators/spark_explosion.txt
+++ b/game_data/base/particle_generators/spark_explosion.txt
@@ -1,4 +1,4 @@
-name = spark_explosion
+name = Spark explosion
 description = An explosion of sparks. Used, for instance, when a bomb rock explodes.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/spicy_sparkles.txt b/game_data/base/particle_generators/spicy_sparkles.txt
index 5261816ed..6561bf6b9 100644
--- a/game_data/base/particle_generators/spicy_sparkles.txt
+++ b/game_data/base/particle_generators/spicy_sparkles.txt
@@ -1,4 +1,4 @@
-name = spicy_sparkles
+name = Spicy sparkles
 description = Rare sparkles left behind by ultra-spicy Pikmin.
 
 emission_interval = 4
diff --git a/game_data/base/particle_generators/spore_explosion_small.txt b/game_data/base/particle_generators/spore_explosion_small.txt
index a9459f6fa..e8fe3c0c4 100644
--- a/game_data/base/particle_generators/spore_explosion_small.txt
+++ b/game_data/base/particle_generators/spore_explosion_small.txt
@@ -1,4 +1,4 @@
-name = spore_explosion_small
+name = Spore explosion (small)
 description = A small explosion of spores, emitted by a destroyed Spotcap.
 
 emission_interval = 0
diff --git a/game_data/base/particle_generators/steam.txt b/game_data/base/particle_generators/steam.txt
index d1f6d0088..54625473d 100644
--- a/game_data/base/particle_generators/steam.txt
+++ b/game_data/base/particle_generators/steam.txt
@@ -1,4 +1,4 @@
-name = steam
+name = Steam
 description = A continuous stream of steam over a large surface. Used when the Armored Cannon Beetle is overheating.
 
 emission_interval = 0.1
diff --git a/game_data/base/particle_generators/white_pikmin_poison.txt b/game_data/base/particle_generators/white_pikmin_poison.txt
index c030faea3..a0c012e6d 100644
--- a/game_data/base/particle_generators/white_pikmin_poison.txt
+++ b/game_data/base/particle_generators/white_pikmin_poison.txt
@@ -1,4 +1,4 @@
-name = white_pikmin_poison
+name = White pikmin poison
 description = A continuous stream of poison particles, signifying an enemy's poison from having ingested a White Pikmin.
 
 emission_interval = 0.3
diff --git a/game_data/base/spike_damage_types/bomb_rock_explosion.txt b/game_data/base/spike_damage_types/bomb_rock_explosion.txt
index d847e21f6..677cb40ea 100644
--- a/game_data/base/spike_damage_types/bomb_rock_explosion.txt
+++ b/game_data/base/spike_damage_types/bomb_rock_explosion.txt
@@ -1,4 +1,4 @@
-name = bomb_rock_explosion
+name = Bomb rock explosion
 description = Damage applied to an enemy that eats a bomb rock. It causes a lot of damage.
 
 damage = 1000
diff --git a/game_data/base/spike_damage_types/poison.txt b/game_data/base/spike_damage_types/poison.txt
index 845c0427e..5aff8717b 100644
--- a/game_data/base/spike_damage_types/poison.txt
+++ b/game_data/base/spike_damage_types/poison.txt
@@ -1,4 +1,4 @@
-name = poison
+name = Poison
 description = Damage applied to an enemy that eats a White Pikmin. It gives them a poison status effect.
 
 ingestion_only = true
diff --git a/game_data/base/statuses/bomb_rock_health_drain.txt b/game_data/base/statuses/bomb_rock_health_drain.txt
index af6b4b667..bf37e6727 100644
--- a/game_data/base/statuses/bomb_rock_health_drain.txt
+++ b/game_data/base/statuses/bomb_rock_health_drain.txt
@@ -1,4 +1,4 @@
-name = bomb_rock_health_drain
+name = Bomb rock health drain
 description = Bomb rocks under this status effect will start losing their health periodically. This is a way to represent their fuse running down, so that they can blow up once it hits zero.
 
 affects_others = true
diff --git a/game_data/base/statuses/bubbled.txt b/game_data/base/statuses/bubbled.txt
index 6b2f8cd63..d7add06a4 100644
--- a/game_data/base/statuses/bubbled.txt
+++ b/game_data/base/statuses/bubbled.txt
@@ -1,4 +1,4 @@
-name = bubbled
+name = Bubbled
 description = Pikmin that are bubbled will start choking with a bubble of water on their top, and will eventually drown and die. It can be saved by being whistled.
 
 affects_pikmin = true
diff --git a/game_data/base/statuses/burned.txt b/game_data/base/statuses/burned.txt
index 365bbec2f..868b2e4fe 100644
--- a/game_data/base/statuses/burned.txt
+++ b/game_data/base/statuses/burned.txt
@@ -1,4 +1,4 @@
-name = burned
+name = Burned
 description = Pikmin that are burning will start choking from the fire on their top, and will eventually suffocate and die. It can be saved by being whistled.
 
 affects_pikmin = true
diff --git a/game_data/base/statuses/crushed.txt b/game_data/base/statuses/crushed.txt
index f4b9ac61e..f53bcaae2 100644
--- a/game_data/base/statuses/crushed.txt
+++ b/game_data/base/statuses/crushed.txt
@@ -1,4 +1,4 @@
-name = crushed
+name = Crushed
 description = Pikmin that are crushed will lie there for a bit before succumbing and dying.
 
 affects_pikmin = true
diff --git a/game_data/base/statuses/double_speed.txt b/game_data/base/statuses/double_speed.txt
index 210c1186f..3c706cf70 100644
--- a/game_data/base/statuses/double_speed.txt
+++ b/game_data/base/statuses/double_speed.txt
@@ -1,4 +1,4 @@
-name = double_speed
+name = Double speed
 description = Makes the affected object move at double the speed.
 
 affects_enemies = true
diff --git a/game_data/base/statuses/drowning.txt b/game_data/base/statuses/drowning.txt
index 0a072c3f3..80de1e5ed 100644
--- a/game_data/base/statuses/drowning.txt
+++ b/game_data/base/statuses/drowning.txt
@@ -1,4 +1,4 @@
-name = drowning
+name = Drowning
 description = Pikmin that are drowning in bodies of water will flail about, but will eventually get tired, drown, and die. It can be saved by being whistled towards the shore.
 
 affects_pikmin = true
diff --git a/game_data/base/statuses/dweevil_with_treasure.txt b/game_data/base/statuses/dweevil_with_treasure.txt
index 734e800ab..4026c42a0 100644
--- a/game_data/base/statuses/dweevil_with_treasure.txt
+++ b/game_data/base/statuses/dweevil_with_treasure.txt
@@ -1,4 +1,4 @@
-name = dweevil_with_treasure
+name = Dweevil with treasure
 description = Dweevils carrying treasure gain some resistance, since the treasure offers some natural protection.
 
 affects_enemies = true
diff --git a/game_data/base/statuses/electrocuted.txt b/game_data/base/statuses/electrocuted.txt
index cf2140342..1a6b78c93 100644
--- a/game_data/base/statuses/electrocuted.txt
+++ b/game_data/base/statuses/electrocuted.txt
@@ -1,4 +1,4 @@
-name = electrocuted
+name = Electrocuted
 description = Pikmin that are electrocuted will stay there for a bit, flashing from the powerful electricity, and will shortly after die.
 
 affects_pikmin = true
diff --git a/game_data/base/statuses/inked.txt b/game_data/base/statuses/inked.txt
index f036f0065..185be5ff3 100644
--- a/game_data/base/statuses/inked.txt
+++ b/game_data/base/statuses/inked.txt
@@ -1,4 +1,4 @@
-name = inked
+name = Inked
 description = Pikmin that are inked will have a harmless glob of ink on their top, and will run around in a panic temporarily. It can be saved faster by being whistled.
 
 affects_pikmin = true
diff --git a/game_data/base/statuses/petrified.txt b/game_data/base/statuses/petrified.txt
index 26f9f116e..0441c44aa 100644
--- a/game_data/base/statuses/petrified.txt
+++ b/game_data/base/statuses/petrified.txt
@@ -1,4 +1,4 @@
-name = petrified
+name = Petrified
 description = Enemies that are petrified will just stay in place, unable to cause harm. They will be slightly more resistant to damage, however.
 
 affects_enemies = true
diff --git a/game_data/base/statuses/petrified_cracked.txt b/game_data/base/statuses/petrified_cracked.txt
index 9112e2d01..ab802e809 100644
--- a/game_data/base/statuses/petrified_cracked.txt
+++ b/game_data/base/statuses/petrified_cracked.txt
@@ -1,4 +1,4 @@
-name = petrified_cracked
+name = Petrified, cracked
 description = Makes the affected object emit some particles from having broken through its petrification, and instantly ends right away.
 
 affects_enemies = true
diff --git a/game_data/base/statuses/petrified_cracking.txt b/game_data/base/statuses/petrified_cracking.txt
index d00183788..698688069 100644
--- a/game_data/base/statuses/petrified_cracking.txt
+++ b/game_data/base/statuses/petrified_cracking.txt
@@ -1,4 +1,4 @@
-name = petrified_cracking
+name = Petrified, cracking
 description = Makes the affected object start shaking, since its petrification is about to crack.
 
 affects_enemies = true
diff --git a/game_data/base/statuses/poisoned.txt b/game_data/base/statuses/poisoned.txt
index b3b304582..475ed92ec 100644
--- a/game_data/base/statuses/poisoned.txt
+++ b/game_data/base/statuses/poisoned.txt
@@ -1,4 +1,4 @@
-name = poisoned
+name = Poisoned
 description = Pikmin that are poisoned will start choking from the poison gas on their top, and will eventually suffocate and die. It can be saved by being whistled.
 
 affects_pikmin = true
diff --git a/game_data/base/statuses/rock_pressed.txt b/game_data/base/statuses/rock_pressed.txt
index a0c497d74..acef8d99d 100644
--- a/game_data/base/statuses/rock_pressed.txt
+++ b/game_data/base/statuses/rock_pressed.txt
@@ -1,4 +1,4 @@
-name = rock_pressed
+name = Rock pressed
 description = Rock Pikmin that are pressed down to the ground have managed to resist being crushed, but will stay this way for a few seconds.
 
 affects_pikmin = true
diff --git a/game_data/base/statuses/shocked.txt b/game_data/base/statuses/shocked.txt
index d0f86597c..85342adf5 100644
--- a/game_data/base/statuses/shocked.txt
+++ b/game_data/base/statuses/shocked.txt
@@ -1,4 +1,4 @@
-name = shocked
+name = Shocked
 description = A Pikmin that has been shocked will be unable to move as the current surges through its body. It can be saved by being whistled.
 
 affects_pikmin = true
diff --git a/game_data/base/statuses/spicy.txt b/game_data/base/statuses/spicy.txt
index f08baa6c0..7fa363bd4 100644
--- a/game_data/base/statuses/spicy.txt
+++ b/game_data/base/statuses/spicy.txt
@@ -1,4 +1,4 @@
-name = spicy
+name = Spicy
 description = A Pikmin that's spicy has been sprayed with ultra-spicy spray, and is able to move faster than normal, for a limited time.
 
 affects_pikmin = true
diff --git a/game_data/base/statuses/triple_speed.txt b/game_data/base/statuses/triple_speed.txt
index 30ef45ded..cf86c3eca 100644
--- a/game_data/base/statuses/triple_speed.txt
+++ b/game_data/base/statuses/triple_speed.txt
@@ -1,4 +1,4 @@
-name = triple_speed
+name = Triple speed
 description = Makes the affected object move at triple the speed.
 
 affects_enemies = true
diff --git a/game_data/base/statuses/white_pikmin_poison.txt b/game_data/base/statuses/white_pikmin_poison.txt
index ae746c915..eb086b789 100644
--- a/game_data/base/statuses/white_pikmin_poison.txt
+++ b/game_data/base/statuses/white_pikmin_poison.txt
@@ -1,4 +1,4 @@
-name = white_pikmin_poison
+name = White Pikmin poison
 description = Enemies that have swallowed White Pikmin will suffer from some poisonous effects as their health temporarily saps away. The more White Pikmin ingested, the longer it lasts for.
 
 affects_enemies = true
diff --git a/source/documents/todo.txt b/source/documents/todo.txt
index d75575dd7..369fc018c 100644
--- a/source/documents/todo.txt
+++ b/source/documents/todo.txt
@@ -1,11 +1,12 @@
-Point I left on (so I can continue the next day without losing my train of thought)
+Point I left on (so I can continue the next day without losing my train of thought)
     
 
 Current tasks (tasks being worked on, but not yet committed)
-    
+    Check for memory leaks
 
 Next tasks (roughly sorted most important first)
     --- To fix ---
+    If a Pikmin is called and stuff happens during the animation, it won't really know about it. At worst, this crashes (if you try dismissing right after) (thanks Helodity)
     https://gitlab.freedesktop.org/xorg/xserver/-/issues/1773
     Hitting Home in the animation editor isn't centering properly (at least not with Blue Pikmin it wasn't)
     If you're on an elevator platform, you won't be able to throw Winged Pikmin
diff --git a/source/source/game_states/animation_editor/editor.h b/source/source/game_states/animation_editor/editor.h
index f754b9437..1c344ac1c 100644
--- a/source/source/game_states/animation_editor/editor.h
+++ b/source/source/game_states/animation_editor/editor.h
@@ -229,7 +229,7 @@ class animation_editor : public editor {
         string problem;
         
         //Internal name of the new animation database.
-        string internal_name;
+        string internal_name = "my_animation";
         
         //Path to the new animation database.
         string anim_path;
diff --git a/source/source/game_states/animation_editor/gui.cpp b/source/source/game_states/animation_editor/gui.cpp
index 5e0f27585..d7e4e7f62 100644
--- a/source/source/game_states/animation_editor/gui.cpp
+++ b/source/source/game_states/animation_editor/gui.cpp
@@ -96,7 +96,7 @@ void animation_editor::open_new_dialog() {
         new_dialog.custom_mob_cat.clear();
         new_dialog.mob_type_ptr = nullptr;
         new_dialog.problem.clear();
-        new_dialog.internal_name.clear();
+        new_dialog.internal_name = "my_animation";
         new_dialog.anim_path.clear();
         new_dialog.must_update = true;
     };
@@ -553,6 +553,9 @@ void animation_editor::process_gui_new_dialog() {
     
     if(new_dialog.type == 0) {
         //Internal name input.
+        if(!ImGui::IsAnyItemActive()) {
+            ImGui::SetKeyboardFocusHere();
+        }
         new_dialog.must_update |=
             ImGui::InputText("Internal name", &new_dialog.internal_name);
         set_tooltip(
@@ -621,7 +624,7 @@ void animation_editor::process_gui_new_dialog() {
     
     //Create button.
     ImGui::Spacer();
-    ImGui::SetupCentering(140);
+    ImGui::SetupCentering(200);
     if(!new_dialog.problem.empty()) {
         ImGui::BeginDisabled();
     }
diff --git a/source/source/game_states/area_editor/editor.h b/source/source/game_states/area_editor/editor.h
index d9864ca55..793d981b2 100644
--- a/source/source/game_states/area_editor/editor.h
+++ b/source/source/game_states/area_editor/editor.h
@@ -850,7 +850,7 @@ class area_editor : public editor {
         string pack;
         
         //Internal name of the new area.
-        string internal_name;
+        string internal_name = "my_area";
         
         //Selected area type.
         int type = AREA_TYPE_SIMPLE;
diff --git a/source/source/game_states/area_editor/gui.cpp b/source/source/game_states/area_editor/gui.cpp
index bc894eb43..398550b1b 100644
--- a/source/source/game_states/area_editor/gui.cpp
+++ b/source/source/game_states/area_editor/gui.cpp
@@ -92,7 +92,7 @@ void area_editor::open_new_dialog() {
     dialogs.back()->custom_size = point(400, 0);
     dialogs.back()->close_callback = [this] () {
         new_dialog.pack.clear();
-        new_dialog.internal_name.clear();
+        new_dialog.internal_name = "my_area";
         new_dialog.type = AREA_TYPE_SIMPLE;
         new_dialog.problem.clear();
         new_dialog.area_path.clear();
@@ -322,6 +322,9 @@ void area_editor::process_gui_new_dialog() {
         
     //Internal name input.
     ImGui::Spacer();
+    if(!ImGui::IsAnyItemActive()) {
+        ImGui::SetKeyboardFocusHere();
+    }
     new_dialog.must_update |=
         ImGui::InputText("Internal name", &new_dialog.internal_name);
     set_tooltip(
diff --git a/source/source/game_states/editor.cpp b/source/source/game_states/editor.cpp
index 97d012b60..94b91a4b6 100644
--- a/source/source/game_states/editor.cpp
+++ b/source/source/game_states/editor.cpp
@@ -1727,12 +1727,15 @@ bool editor::process_gui_new_dialog_pack_widgets(string* pack) {
  * @brief Processes the dialog for creating a new pack.
  */
 void editor::process_gui_new_pack_dialog() {
-    static string internal_name;
-    static string name;
+    static string internal_name = "my_pack";
+    static string name = "My pack!";
     static string description;
     static string maker;
     
     //Internal name input.
+    if(!ImGui::IsAnyItemActive()) {
+        ImGui::SetKeyboardFocusHere();
+    }
     ImGui::InputText("Internal name", &internal_name);
     set_tooltip(
         "Internal name of the new pack.\n"