From 86acbe5b557020da39102d612c52fc4ea99e1f3e Mon Sep 17 00:00:00 2001
From: Rangi <35663410+Rangi42@users.noreply.github.com>
Date: Sun, 17 Aug 2025 09:48:05 -0400
Subject: [PATCH] Use `dname` macro to automatically pad names with `"@"`
 characters (#1198)

---
 data/battle_tower/classes.asm               | 146 +++---
 data/battle_tower/parties.asm               | 420 ++++++++--------
 data/events/npc_trades.asm                  |  21 +-
 data/events/odd_eggs.asm                    |  28 +-
 data/pokemon/names.asm                      | 512 ++++++++++----------
 engine/events/battle_tower/battle_tower.asm |   2 +-
 engine/events/odd_egg.asm                   |   2 +-
 engine/menus/intro_menu.asm                 |   4 +-
 engine/movie/trade_animation.asm            |   7 +-
 engine/pokemon/correct_party_errors.asm     |   2 +-
 macros/data.asm                             |  12 +
 mobile/mobile_42.asm                        |   8 +-
 mobile/mobile_5f.asm                        |   4 +-
 13 files changed, 594 insertions(+), 574 deletions(-)

diff --git a/data/battle_tower/classes.asm b/data/battle_tower/classes.asm
index 12cf47c69..604b0e7ee 100644
--- a/data/battle_tower/classes.asm
+++ b/data/battle_tower/classes.asm
@@ -1,79 +1,83 @@
+MACRO bt_trainer
+	dname \2 ; name
+	db \1 ; class
+ENDM
+
 BattleTowerTrainers:
 ; The trainer class is not used in Crystal 1.0 due to a bug.
 ; Instead, the sixth character in the trainer's name is used.
 ; See BattleTowerText in engine/events/battle_tower/trainer_text.asm.
 	table_width (NAME_LENGTH - 1) + 1
-	; name, class
-	db "HANSON@@@@", FISHER
-	db "SAWYER@@@@", POKEMANIAC
-	db "MASUDA@@@@", GUITARIST
-	db "NICKEL@@@@", SCIENTIST
-	db "OLSON@@@@@", POKEFANM
-	db "ZABOROWSKI", LASS
-	db "WRIGHT@@@@", YOUNGSTER
-	db "ALEXANDER@", HIKER
-	db "KAWAKAMI@@", TEACHER
-	db "BICKETT@@@", POKEFANM
-	db "SAITO@@@@@", KIMONO_GIRL
-	db "CRAWFORD@@", BOARDER
-	db "DIAZ@@@@@@", PICNICKER
-	db "ERICKSON@@", BIKER
-	db "FAIRFIELD@", JUGGLER
-	db "HUNTER@@@@", POKEFANF
-	db "HILL@@@@@@", FIREBREATHER
-	db "JAVIER@@@@", SWIMMERF
-	db "KAUFMAN@@@", SWIMMERM
-	db "LANCASTER@", SKIER
-	db "McMAHILL@@", CAMPER
+	bt_trainer FISHER,       "HANSON"
+	bt_trainer POKEMANIAC,   "SAWYER"
+	bt_trainer GUITARIST,    "MASUDA"
+	bt_trainer SCIENTIST,    "NICKEL"
+	bt_trainer POKEFANM,     "OLSON"
+	bt_trainer LASS,         "ZABOROWSKI"
+	bt_trainer YOUNGSTER,    "WRIGHT"
+	bt_trainer HIKER,        "ALEXANDER"
+	bt_trainer TEACHER,      "KAWAKAMI"
+	bt_trainer POKEFANM,     "BICKETT"
+	bt_trainer KIMONO_GIRL,  "SAITO"
+	bt_trainer BOARDER,      "CRAWFORD"
+	bt_trainer PICNICKER,    "DIAZ"
+	bt_trainer BIKER,        "ERICKSON"
+	bt_trainer JUGGLER,      "FAIRFIELD"
+	bt_trainer POKEFANF,     "HUNTER"
+	bt_trainer FIREBREATHER, "HILL"
+	bt_trainer SWIMMERF,     "JAVIER"
+	bt_trainer SWIMMERM,     "KAUFMAN"
+	bt_trainer SKIER,        "LANCASTER"
+	bt_trainer CAMPER,       "McMAHILL"
 	assert_table_length BATTLETOWER_NUM_UNIQUE_MON
 ; The following can only be sampled in Crystal 1.1.
-	db "OBRIEN@@@@", GENTLEMAN
-	db "FROST@@@@@", BEAUTY
-	db "MORSE@@@@@", SUPER_NERD
-	db "YUFUNE@@@@", BLACKBELT_T
-	db "RAJAN@@@@@", COOLTRAINERF
-	db "RODRIGUEZ@", OFFICER
-	db "SANTIAGO@@", PSYCHIC_T
-	db "STOCK@@@@@", POKEFANM
-	db "THURMAN@@@", SCIENTIST
-	db "VALENTINO@", BEAUTY
-	db "WAGNER@@@@", CAMPER
-	db "YATES@@@@@", BIRD_KEEPER
-	db "ANDREWS@@@", PICNICKER
-	db "BAHN@@@@@@", POKEMANIAC
-	db "MORI@@@@@@", SCIENTIST
-	db "BUCKMAN@@@", SAGE
-	db "COBB@@@@@@", SCHOOLBOY
-	db "HUGHES@@@@", FISHER
-	db "ARITA@@@@@", KIMONO_GIRL
-	db "EASTON@@@@", PSYCHIC_T
-	db "FREEMAN@@@", CAMPER
-	db "GIESE@@@@@", LASS
-	db "HATCHER@@@", GENTLEMAN
-	db "JACKSON@@@", POKEFANF
-	db "KAHN@@@@@@", POKEMANIAC
-	db "LEONG@@@@@", YOUNGSTER
-	db "MARINO@@@@", TEACHER
-	db "NEWMAN@@@@", SAILOR
-	db "NGUYEN@@@@", BLACKBELT_T
-	db "OGDEN@@@@@", SUPER_NERD
-	db "PARK@@@@@@", COOLTRAINERF
-	db "RAINE@@@@@", SWIMMERM
-	db "SELLS@@@@@", BIRD_KEEPER
-	db "ROCKWELL@@", BOARDER
-	db "THORNTON@@", LASS
-	db "TURNER@@@@", OFFICER
-	db "VAN DYKE@@", SKIER
-	db "WALKER@@@@", SCHOOLBOY
-	db "MEYER@@@@@", SWIMMERF
-	db "JOHNSON@@@", YOUNGSTER
-	db "ADAMS@@@@@", GUITARIST
-	db "SMITH@@@@@", BUG_CATCHER
-	db "TAJIRI@@@@", BUG_CATCHER
-	db "BAKER@@@@@", POKEMANIAC
-	db "COLLINS@@@", SCIENTIST
-	db "SMART@@@@@", SUPER_NERD
-	db "DYKSTRA@@@", SWIMMERF
-	db "EATON@@@@@", BIKER
-	db "WONG@@@@@@", FIREBREATHER
+	bt_trainer GENTLEMAN,    "OBRIEN"
+	bt_trainer BEAUTY,       "FROST"
+	bt_trainer SUPER_NERD,   "MORSE"
+	bt_trainer BLACKBELT_T,  "YUFUNE"
+	bt_trainer COOLTRAINERF, "RAJAN"
+	bt_trainer OFFICER,      "RODRIGUEZ"
+	bt_trainer PSYCHIC_T,    "SANTIAGO"
+	bt_trainer POKEFANM,     "STOCK"
+	bt_trainer SCIENTIST,    "THURMAN"
+	bt_trainer BEAUTY,       "VALENTINO"
+	bt_trainer CAMPER,       "WAGNER"
+	bt_trainer BIRD_KEEPER,  "YATES"
+	bt_trainer PICNICKER,    "ANDREWS"
+	bt_trainer POKEMANIAC,   "BAHN"
+	bt_trainer SCIENTIST,    "MORI"
+	bt_trainer SAGE,         "BUCKMAN"
+	bt_trainer SCHOOLBOY,    "COBB"
+	bt_trainer FISHER,       "HUGHES"
+	bt_trainer KIMONO_GIRL,  "ARITA"
+	bt_trainer PSYCHIC_T,    "EASTON"
+	bt_trainer CAMPER,       "FREEMAN"
+	bt_trainer LASS,         "GIESE"
+	bt_trainer GENTLEMAN,    "HATCHER"
+	bt_trainer POKEFANF,     "JACKSON"
+	bt_trainer POKEMANIAC,   "KAHN"
+	bt_trainer YOUNGSTER,    "LEONG"
+	bt_trainer TEACHER,      "MARINO"
+	bt_trainer SAILOR,       "NEWMAN"
+	bt_trainer BLACKBELT_T,  "NGUYEN"
+	bt_trainer SUPER_NERD,   "OGDEN"
+	bt_trainer COOLTRAINERF, "PARK"
+	bt_trainer SWIMMERM,     "RAINE"
+	bt_trainer BIRD_KEEPER,  "SELLS"
+	bt_trainer BOARDER,      "ROCKWELL"
+	bt_trainer LASS,         "THORNTON"
+	bt_trainer OFFICER,      "TURNER"
+	bt_trainer SKIER,        "VAN DYKE"
+	bt_trainer SCHOOLBOY,    "WALKER"
+	bt_trainer SWIMMERF,     "MEYER"
+	bt_trainer YOUNGSTER,    "JOHNSON"
+	bt_trainer GUITARIST,    "ADAMS"
+	bt_trainer BUG_CATCHER,  "SMITH"
+	bt_trainer BUG_CATCHER,  "TAJIRI"
+	bt_trainer POKEMANIAC,   "BAKER"
+	bt_trainer SCIENTIST,    "COLLINS"
+	bt_trainer SUPER_NERD,   "SMART"
+	bt_trainer SWIMMERF,     "DYKSTRA"
+	bt_trainer BIKER,        "EATON"
+	bt_trainer FIREBREATHER, "WONG"
 	assert_table_length BATTLETOWER_NUM_UNIQUE_TRAINERS
diff --git a/data/battle_tower/parties.asm b/data/battle_tower/parties.asm
index da0c54810..326458869 100644
--- a/data/battle_tower/parties.asm
+++ b/data/battle_tower/parties.asm
@@ -28,7 +28,7 @@ BattleTowerMons:
 	bigdw 37 ; Spd
 	bigdw 34 ; SAtk
 	bigdw 31 ; SDef
-	db "SANDA-SU@@@"
+	dname "SANDA-SU", MON_NAME_LENGTH
 
 	db ESPEON
 	db LEFTOVERS
@@ -54,7 +54,7 @@ BattleTowerMons:
 	bigdw 35 ; Spd
 	bigdw 38 ; SAtk
 	bigdw 31 ; SDef
-	db "E-HUi@@@@@@"
+	dname "E-HUi", MON_NAME_LENGTH
 
 	db UMBREON
 	db GOLD_BERRY
@@ -80,7 +80,7 @@ BattleTowerMons:
 	bigdw 26 ; Spd
 	bigdw 25 ; SAtk
 	bigdw 39 ; SDef
-	db "BURAtuKI-@@"
+	dname "BURAtuKI-", MON_NAME_LENGTH
 
 	db WOBBUFFET
 	db FOCUS_BAND
@@ -106,7 +106,7 @@ BattleTowerMons:
 	bigdw 19 ; Spd
 	bigdw 18 ; SAtk
 	bigdw 23 ; SDef
-	db "SO-NANSU@@@"
+	dname "SO-NANSU", MON_NAME_LENGTH
 
 	db KANGASKHAN
 	db MIRACLEBERRY
@@ -132,7 +132,7 @@ BattleTowerMons:
 	bigdw 29 ; Spd
 	bigdw 20 ; SAtk
 	bigdw 28 ; SDef
-	db "GARU-RA@@@@"
+	dname "GARU-RA", MON_NAME_LENGTH
 
 	db CORSOLA
 	db SCOPE_LENS
@@ -158,7 +158,7 @@ BattleTowerMons:
 	bigdw 19 ; Spd
 	bigdw 24 ; SAtk
 	bigdw 28 ; SDef
-	db "SANI-GO@@@@"
+	dname "SANI-GO", MON_NAME_LENGTH
 
 	db MILTANK
 	db GOLD_BERRY
@@ -184,7 +184,7 @@ BattleTowerMons:
 	bigdw 31 ; Spd
 	bigdw 20 ; SAtk
 	bigdw 26 ; SDef
-	db "MIRUTANKU@@"
+	dname "MIRUTANKU", MON_NAME_LENGTH
 
 	db AERODACTYL
 	db LEFTOVERS
@@ -210,7 +210,7 @@ BattleTowerMons:
 	bigdw 38 ; Spd
 	bigdw 23 ; SAtk
 	bigdw 26 ; SDef
-	db "PUTERA@@@@@"
+	dname "PUTERA", MON_NAME_LENGTH
 
 	db LAPRAS
 	db MIRACLEBERRY
@@ -236,7 +236,7 @@ BattleTowerMons:
 	bigdw 24 ; Spd
 	bigdw 28 ; SAtk
 	bigdw 30 ; SDef
-	db "RAPURASU@@@"
+	dname "RAPURASU", MON_NAME_LENGTH
 
 	db SNEASEL
 	db GOLD_BERRY
@@ -262,7 +262,7 @@ BattleTowerMons:
 	bigdw 34 ; Spd
 	bigdw 19 ; SAtk
 	bigdw 27 ; SDef
-	db "NIyu-RA@@@@"
+	dname "NIyu-RA", MON_NAME_LENGTH
 
 	db PORYGON2
 	db BRIGHTPOWDER
@@ -288,7 +288,7 @@ BattleTowerMons:
 	bigdw 23 ; Spd
 	bigdw 33 ; SAtk
 	bigdw 31 ; SDef
-	db "PORIGON2@@@"
+	dname "PORIGON2", MON_NAME_LENGTH
 
 	db MISDREAVUS
 	db FOCUS_BAND
@@ -314,7 +314,7 @@ BattleTowerMons:
 	bigdw 28 ; Spd
 	bigdw 29 ; SAtk
 	bigdw 29 ; SDef
-	db "MUUMA@@@@@@"
+	dname "MUUMA", MON_NAME_LENGTH
 
 	db HOUNDOUR
 	db GOLD_BERRY
@@ -340,7 +340,7 @@ BattleTowerMons:
 	bigdw 25 ; Spd
 	bigdw 28 ; SAtk
 	bigdw 22 ; SDef
-	db "DERUBIRU@@@"
+	dname "DERUBIRU", MON_NAME_LENGTH
 
 	db GIRAFARIG
 	db KINGS_ROCK
@@ -366,7 +366,7 @@ BattleTowerMons:
 	bigdw 29 ; Spd
 	bigdw 29 ; SAtk
 	bigdw 24 ; SDef
-	db "KIRINRIKI@@"
+	dname "KIRINRIKI", MON_NAME_LENGTH
 
 	db BLISSEY
 	db QUICK_CLAW
@@ -392,7 +392,7 @@ BattleTowerMons:
 	bigdw 22 ; Spd
 	bigdw 27 ; SAtk
 	bigdw 39 ; SDef
-	db "HAPINASU@@@"
+	dname "HAPINASU", MON_NAME_LENGTH
 
 	db SNORLAX
 	db MIRACLEBERRY
@@ -418,7 +418,7 @@ BattleTowerMons:
 	bigdw 18 ; Spd
 	bigdw 23 ; SAtk
 	bigdw 32 ; SDef
-	db "KABIGON@@@@"
+	dname "KABIGON", MON_NAME_LENGTH
 
 	db EXEGGUTOR
 	db KINGS_ROCK
@@ -444,7 +444,7 @@ BattleTowerMons:
 	bigdw 23 ; Spd
 	bigdw 37 ; SAtk
 	bigdw 25 ; SDef
-	db "NAtuSI-@@@@"
+	dname "NAtuSI-", MON_NAME_LENGTH
 
 	db HERACROSS
 	db GOLD_BERRY
@@ -470,7 +470,7 @@ BattleTowerMons:
 	bigdw 29 ; Spd
 	bigdw 18 ; SAtk
 	bigdw 29 ; SDef
-	db "HERAKUROSU@"
+	dname "HERAKUROSU", MON_NAME_LENGTH
 
 	db UNOWN
 	db BERRY
@@ -496,7 +496,7 @@ BattleTowerMons:
 	bigdw 21 ; Spd
 	bigdw 26 ; SAtk
 	bigdw 21 ; SDef
-	db "ANNO-N@@@@@"
+	dname "ANNO-N", MON_NAME_LENGTH
 
 	db TAUROS
 	db KINGS_ROCK
@@ -522,7 +522,7 @@ BattleTowerMons:
 	bigdw 32 ; Spd
 	bigdw 18 ; SAtk
 	bigdw 24 ; SDef
-	db "KENTAROSU@@"
+	dname "KENTAROSU", MON_NAME_LENGTH
 
 	db MR__MIME
 	db QUICK_CLAW
@@ -548,7 +548,7 @@ BattleTowerMons:
 	bigdw 28 ; Spd
 	bigdw 30 ; SAtk
 	bigdw 34 ; SDef
-	db "BARIYA-DO@@"
+	dname "BARIYA-DO", MON_NAME_LENGTH
 
 
 ; BattleTowerMons group 2
@@ -577,7 +577,7 @@ BattleTowerMons:
 	bigdw 46 ; Spd
 	bigdw 44 ; SAtk
 	bigdw 72 ; SDef
-	db "BURAtuKI-@@"
+	dname "BURAtuKI-", MON_NAME_LENGTH
 
 	db STARMIE
 	db GOLD_BERRY
@@ -603,7 +603,7 @@ BattleTowerMons:
 	bigdw 67 ; Spd
 	bigdw 60 ; SAtk
 	bigdw 54 ; SDef
-	db "SUTA-MI-@@@"
+	dname "SUTA-MI-", MON_NAME_LENGTH
 
 	db GYARADOS
 	db MIRACLEBERRY
@@ -629,7 +629,7 @@ BattleTowerMons:
 	bigdw 54 ; Spd
 	bigdw 45 ; SAtk
 	bigdw 61 ; SDef
-	db "GIyaRADOSU@"
+	dname "GIyaRADOSU", MON_NAME_LENGTH
 
 	db STEELIX
 	db GOLD_BERRY
@@ -655,7 +655,7 @@ BattleTowerMons:
 	bigdw 31 ; Spd
 	bigdw 44 ; SAtk
 	bigdw 48 ; SDef
-	db "HAGANE-RU@@"
+	dname "HAGANE-RU", MON_NAME_LENGTH
 
 	db ALAKAZAM
 	db BERRY_JUICE
@@ -681,7 +681,7 @@ BattleTowerMons:
 	bigdw 69 ; Spd
 	bigdw 75 ; SAtk
 	bigdw 55 ; SDef
-	db "HU-DEiN@@@@"
+	dname "HU-DEiN", MON_NAME_LENGTH
 
 	db ARCANINE
 	db BRIGHTPOWDER
@@ -707,7 +707,7 @@ BattleTowerMons:
 	bigdw 60 ; Spd
 	bigdw 60 ; SAtk
 	bigdw 52 ; SDef
-	db "UINDEi@@@@@"
+	dname "UINDEi", MON_NAME_LENGTH
 
 	db HERACROSS
 	db FOCUS_BAND
@@ -733,7 +733,7 @@ BattleTowerMons:
 	bigdw 52 ; Spd
 	bigdw 37 ; SAtk
 	bigdw 59 ; SDef
-	db "HERAKUROSU@"
+	dname "HERAKUROSU", MON_NAME_LENGTH
 
 	db EXEGGUTOR
 	db LEFTOVERS
@@ -759,7 +759,7 @@ BattleTowerMons:
 	bigdw 43 ; Spd
 	bigdw 70 ; SAtk
 	bigdw 46 ; SDef
-	db "NAtuSI-@@@@"
+	dname "NAtuSI-", MON_NAME_LENGTH
 
 	db AERODACTYL
 	db GOLD_BERRY
@@ -785,7 +785,7 @@ BattleTowerMons:
 	bigdw 72 ; Spd
 	bigdw 44 ; SAtk
 	bigdw 50 ; SDef
-	db "PUTERA@@@@@"
+	dname "PUTERA", MON_NAME_LENGTH
 
 	db BLISSEY
 	db BRIGHTPOWDER
@@ -811,7 +811,7 @@ BattleTowerMons:
 	bigdw 41 ; Spd
 	bigdw 51 ; SAtk
 	bigdw 75 ; SDef
-	db "HAPINASU@@@"
+	dname "HAPINASU", MON_NAME_LENGTH
 
 	db LAPRAS
 	db GOLD_BERRY
@@ -837,7 +837,7 @@ BattleTowerMons:
 	bigdw 45 ; Spd
 	bigdw 50 ; SAtk
 	bigdw 54 ; SDef
-	db "RAPURASU@@@"
+	dname "RAPURASU", MON_NAME_LENGTH
 
 	db PIKACHU
 	db LIGHT_BALL
@@ -863,7 +863,7 @@ BattleTowerMons:
 	bigdw 58 ; Spd
 	bigdw 41 ; SAtk
 	bigdw 37 ; SDef
-	db "PIKATIyuU@@"
+	dname "PIKATIyuU", MON_NAME_LENGTH
 
 	db SCIZOR
 	db FOCUS_BAND
@@ -889,7 +889,7 @@ BattleTowerMons:
 	bigdw 47 ; Spd
 	bigdw 43 ; SAtk
 	bigdw 53 ; SDef
-	db "HAtuSAMU@@@"
+	dname "HAtuSAMU", MON_NAME_LENGTH
 
 	db HITMONCHAN
 	db GOLD_BERRY
@@ -915,7 +915,7 @@ BattleTowerMons:
 	bigdw 52 ; Spd
 	bigdw 32 ; SAtk
 	bigdw 62 ; SDef
-	db "EBIWARA-@@@"
+	dname "EBIWARA-", MON_NAME_LENGTH
 
 	db TAUROS
 	db BRIGHTPOWDER
@@ -941,7 +941,7 @@ BattleTowerMons:
 	bigdw 63 ; Spd
 	bigdw 35 ; SAtk
 	bigdw 47 ; SDef
-	db "KENTAROSU@@"
+	dname "KENTAROSU", MON_NAME_LENGTH
 
 	db AZUMARILL
 	db MYSTIC_WATER
@@ -967,7 +967,7 @@ BattleTowerMons:
 	bigdw 41 ; Spd
 	bigdw 37 ; SAtk
 	bigdw 49 ; SDef
-	db "MARIRURI@@@"
+	dname "MARIRURI", MON_NAME_LENGTH
 
 	db MILTANK
 	db KINGS_ROCK
@@ -993,7 +993,7 @@ BattleTowerMons:
 	bigdw 61 ; Spd
 	bigdw 36 ; SAtk
 	bigdw 48 ; SDef
-	db "MIRUTANKU@@"
+	dname "MIRUTANKU", MON_NAME_LENGTH
 
 	db WIGGLYTUFF
 	db GOLD_BERRY
@@ -1019,7 +1019,7 @@ BattleTowerMons:
 	bigdw 39 ; Spd
 	bigdw 50 ; SAtk
 	bigdw 40 ; SDef
-	db "PUKURIN@@@@"
+	dname "PUKURIN", MON_NAME_LENGTH
 
 	db WIGGLYTUFF
 	db PINK_BOW
@@ -1045,7 +1045,7 @@ BattleTowerMons:
 	bigdw 34 ; Spd
 	bigdw 46 ; SAtk
 	bigdw 36 ; SDef
-	db "PUKURIN@@@@"
+	dname "PUKURIN", MON_NAME_LENGTH
 
 	db NIDOKING
 	db BERRY
@@ -1071,7 +1071,7 @@ BattleTowerMons:
 	bigdw 49 ; Spd
 	bigdw 50 ; SAtk
 	bigdw 46 ; SDef
-	db "NIDOKINGU@@"
+	dname "NIDOKINGU", MON_NAME_LENGTH
 
 	db QUAGSIRE
 	db QUICK_CLAW
@@ -1097,7 +1097,7 @@ BattleTowerMons:
 	bigdw 29 ; Spd
 	bigdw 42 ; SAtk
 	bigdw 42 ; SDef
-	db "NUO-@@@@@@@"
+	dname "NUO-", MON_NAME_LENGTH
 
 
 ; BattleTowerMons group 3
@@ -1126,7 +1126,7 @@ BattleTowerMons:
 	bigdw 107 ; Spd
 	bigdw 96 ; SAtk
 	bigdw 87 ; SDef
-	db "SANDA-SU@@@"
+	dname "SANDA-SU", MON_NAME_LENGTH
 
 	db POLIWRATH
 	db BRIGHTPOWDER
@@ -1152,7 +1152,7 @@ BattleTowerMons:
 	bigdw 73 ; Spd
 	bigdw 70 ; SAtk
 	bigdw 82 ; SDef
-	db "NIyoROBON@@"
+	dname "NIyoROBON", MON_NAME_LENGTH
 
 	db STARMIE
 	db LEFTOVERS
@@ -1178,7 +1178,7 @@ BattleTowerMons:
 	bigdw 99 ; Spd
 	bigdw 90 ; SAtk
 	bigdw 81 ; SDef
-	db "SUTA-MI-@@@"
+	dname "SUTA-MI-", MON_NAME_LENGTH
 
 	db JYNX
 	db GOLD_BERRY
@@ -1204,7 +1204,7 @@ BattleTowerMons:
 	bigdw 83 ; Spd
 	bigdw 98 ; SAtk
 	bigdw 86 ; SDef
-	db "RU-ZIyuRA@@"
+	dname "RU-ZIyuRA", MON_NAME_LENGTH
 
 	db DUGTRIO
 	db KINGS_ROCK
@@ -1230,7 +1230,7 @@ BattleTowerMons:
 	bigdw 102 ; Spd
 	bigdw 60 ; SAtk
 	bigdw 72 ; SDef
-	db "DAGUTORIO@@"
+	dname "DAGUTORIO", MON_NAME_LENGTH
 
 	db BELLOSSOM
 	db BRIGHTPOWDER
@@ -1256,7 +1256,7 @@ BattleTowerMons:
 	bigdw 60 ; Spd
 	bigdw 82 ; SAtk
 	bigdw 88 ; SDef
-	db "KIREIHANA@@"
+	dname "KIREIHANA", MON_NAME_LENGTH
 
 	db BLISSEY
 	db LEFTOVERS
@@ -1282,7 +1282,7 @@ BattleTowerMons:
 	bigdw 59 ; Spd
 	bigdw 73 ; SAtk
 	bigdw 109 ; SDef
-	db "HAPINASU@@@"
+	dname "HAPINASU", MON_NAME_LENGTH
 
 	db HOUNDOOM
 	db CHARCOAL
@@ -1308,7 +1308,7 @@ BattleTowerMons:
 	bigdw 86 ; Spd
 	bigdw 94 ; SAtk
 	bigdw 76 ; SDef
-	db "HERUGA-@@@@"
+	dname "HERUGA-", MON_NAME_LENGTH
 
 	db MACHAMP
 	db MIRACLEBERRY
@@ -1334,7 +1334,7 @@ BattleTowerMons:
 	bigdw 61 ; Spd
 	bigdw 68 ; SAtk
 	bigdw 80 ; SDef
-	db "KAIRIKI-@@@"
+	dname "KAIRIKI-", MON_NAME_LENGTH
 
 	db CROBAT
 	db GOLD_BERRY
@@ -1360,7 +1360,7 @@ BattleTowerMons:
 	bigdw 103 ; Spd
 	bigdw 70 ; SAtk
 	bigdw 76 ; SDef
-	db "KUROBAtuTO@"
+	dname "KUROBAtuTO", MON_NAME_LENGTH
 
 	db PORYGON2
 	db BRIGHTPOWDER
@@ -1386,7 +1386,7 @@ BattleTowerMons:
 	bigdw 66 ; Spd
 	bigdw 87 ; SAtk
 	bigdw 81 ; SDef
-	db "PORIGON2@@@"
+	dname "PORIGON2", MON_NAME_LENGTH
 
 	db MAROWAK
 	db THICK_CLUB
@@ -1412,7 +1412,7 @@ BattleTowerMons:
 	bigdw 56 ; Spd
 	bigdw 54 ; SAtk
 	bigdw 72 ; SDef
-	db "GARAGARA@@@"
+	dname "GARAGARA", MON_NAME_LENGTH
 
 	db ELECTRODE
 	db BRIGHTPOWDER
@@ -1438,7 +1438,7 @@ BattleTowerMons:
 	bigdw 113 ; Spd
 	bigdw 78 ; SAtk
 	bigdw 78 ; SDef
-	db "MARUMAIN@@@"
+	dname "MARUMAIN", MON_NAME_LENGTH
 
 	db LAPRAS
 	db LEFTOVERS
@@ -1464,7 +1464,7 @@ BattleTowerMons:
 	bigdw 65 ; Spd
 	bigdw 75 ; SAtk
 	bigdw 81 ; SDef
-	db "RAPURASU@@@"
+	dname "RAPURASU", MON_NAME_LENGTH
 
 	db LANTURN
 	db GOLD_BERRY
@@ -1490,7 +1490,7 @@ BattleTowerMons:
 	bigdw 66 ; Spd
 	bigdw 70 ; SAtk
 	bigdw 70 ; SDef
-	db "RANTA-N@@@@"
+	dname "RANTA-N", MON_NAME_LENGTH
 
 	db ESPEON
 	db MIRACLEBERRY
@@ -1516,7 +1516,7 @@ BattleTowerMons:
 	bigdw 96 ; Spd
 	bigdw 103 ; SAtk
 	bigdw 82 ; SDef
-	db "E-HUi@@@@@@"
+	dname "E-HUi", MON_NAME_LENGTH
 
 	db TENTACRUEL
 	db KINGS_ROCK
@@ -1542,7 +1542,7 @@ BattleTowerMons:
 	bigdw 90 ; Spd
 	bigdw 77 ; SAtk
 	bigdw 101 ; SDef
-	db "DOKUKURAGE@"
+	dname "DOKUKURAGE", MON_NAME_LENGTH
 
 	db GENGAR
 	db GOLD_BERRY
@@ -1568,7 +1568,7 @@ BattleTowerMons:
 	bigdw 96 ; Spd
 	bigdw 103 ; SAtk
 	bigdw 70 ; SDef
-	db "GENGA-@@@@@"
+	dname "GENGA-", MON_NAME_LENGTH
 
 	db URSARING
 	db GOLD_BERRY
@@ -1594,7 +1594,7 @@ BattleTowerMons:
 	bigdw 53 ; Spd
 	bigdw 65 ; SAtk
 	bigdw 65 ; SDef
-	db "RINGUMA@@@@"
+	dname "RINGUMA", MON_NAME_LENGTH
 
 	db FEAROW
 	db BRIGHTPOWDER
@@ -1620,7 +1620,7 @@ BattleTowerMons:
 	bigdw 82 ; Spd
 	bigdw 58 ; SAtk
 	bigdw 58 ; SDef
-	db "ONIDORIRU@@"
+	dname "ONIDORIRU", MON_NAME_LENGTH
 
 	db PRIMEAPE
 	db MIRACLEBERRY
@@ -1646,7 +1646,7 @@ BattleTowerMons:
 	bigdw 78 ; Spd
 	bigdw 58 ; SAtk
 	bigdw 64 ; SDef
-	db "OKORIZARU@@"
+	dname "OKORIZARU", MON_NAME_LENGTH
 
 
 ; BattleTowerMons group 4
@@ -1675,7 +1675,7 @@ BattleTowerMons:
 	bigdw 127 ; Spd
 	bigdw 70 ; SAtk
 	bigdw 94 ; SDef
-	db "KENTAROSU@@"
+	dname "KENTAROSU", MON_NAME_LENGTH
 
 	db KINGDRA
 	db LEFTOVERS
@@ -1701,7 +1701,7 @@ BattleTowerMons:
 	bigdw 106 ; Spd
 	bigdw 115 ; SAtk
 	bigdw 115 ; SDef
-	db "KINGUDORA@@"
+	dname "KINGUDORA", MON_NAME_LENGTH
 
 	db SNORLAX
 	db QUICK_CLAW
@@ -1727,7 +1727,7 @@ BattleTowerMons:
 	bigdw 61 ; Spd
 	bigdw 89 ; SAtk
 	bigdw 125 ; SDef
-	db "KABIGON@@@@"
+	dname "KABIGON", MON_NAME_LENGTH
 
 	db LAPRAS
 	db LEFTOVERS
@@ -1753,7 +1753,7 @@ BattleTowerMons:
 	bigdw 86 ; Spd
 	bigdw 103 ; SAtk
 	bigdw 111 ; SDef
-	db "RAPURASU@@@"
+	dname "RAPURASU", MON_NAME_LENGTH
 
 	db STEELIX
 	db GOLD_BERRY
@@ -1779,7 +1779,7 @@ BattleTowerMons:
 	bigdw 61 ; Spd
 	bigdw 79 ; SAtk
 	bigdw 87 ; SDef
-	db "HAGANE-RU@@"
+	dname "HAGANE-RU", MON_NAME_LENGTH
 
 	db ALAKAZAM
 	db KINGS_ROCK
@@ -1805,7 +1805,7 @@ BattleTowerMons:
 	bigdw 135 ; Spd
 	bigdw 147 ; SAtk
 	bigdw 107 ; SDef
-	db "HU-DEiN@@@@"
+	dname "HU-DEiN", MON_NAME_LENGTH
 
 	db STARMIE
 	db LEFTOVERS
@@ -1831,7 +1831,7 @@ BattleTowerMons:
 	bigdw 127 ; Spd
 	bigdw 117 ; SAtk
 	bigdw 105 ; SDef
-	db "SUTA-MI-@@@"
+	dname "SUTA-MI-", MON_NAME_LENGTH
 
 	db WOBBUFFET
 	db GOLD_BERRY
@@ -1857,7 +1857,7 @@ BattleTowerMons:
 	bigdw 64 ; Spd
 	bigdw 59 ; SAtk
 	bigdw 79 ; SDef
-	db "SO-NANSU@@@"
+	dname "SO-NANSU", MON_NAME_LENGTH
 
 	db GOLEM
 	db FOCUS_BAND
@@ -1883,7 +1883,7 @@ BattleTowerMons:
 	bigdw 74 ; Spd
 	bigdw 80 ; SAtk
 	bigdw 88 ; SDef
-	db "GORO-NIya@@"
+	dname "GORO-NIya", MON_NAME_LENGTH
 
 	db SCIZOR
 	db SCOPE_LENS
@@ -1909,7 +1909,7 @@ BattleTowerMons:
 	bigdw 89 ; Spd
 	bigdw 82 ; SAtk
 	bigdw 102 ; SDef
-	db "HAtuSAMU@@@"
+	dname "HAtuSAMU", MON_NAME_LENGTH
 
 	db DUGTRIO
 	db KINGS_ROCK
@@ -1935,7 +1935,7 @@ BattleTowerMons:
 	bigdw 131 ; Spd
 	bigdw 75 ; SAtk
 	bigdw 91 ; SDef
-	db "DAGUTORIO@@"
+	dname "DAGUTORIO", MON_NAME_LENGTH
 
 	db SLOWBRO
 	db MIRACLEBERRY
@@ -1961,7 +1961,7 @@ BattleTowerMons:
 	bigdw 60 ; Spd
 	bigdw 119 ; SAtk
 	bigdw 103 ; SDef
-	db "YADORAN@@@@"
+	dname "YADORAN", MON_NAME_LENGTH
 
 	db PORYGON2
 	db NO_ITEM
@@ -1987,7 +1987,7 @@ BattleTowerMons:
 	bigdw 86 ; Spd
 	bigdw 123 ; SAtk
 	bigdw 115 ; SDef
-	db "PORIGON2@@@"
+	dname "PORIGON2", MON_NAME_LENGTH
 
 	db ARCANINE
 	db CHARCOAL
@@ -2013,7 +2013,7 @@ BattleTowerMons:
 	bigdw 111 ; Spd
 	bigdw 115 ; SAtk
 	bigdw 99 ; SDef
-	db "UINDEi@@@@@"
+	dname "UINDEi", MON_NAME_LENGTH
 
 	db FORRETRESS
 	db LEFTOVERS
@@ -2039,7 +2039,7 @@ BattleTowerMons:
 	bigdw 64 ; Spd
 	bigdw 87 ; SAtk
 	bigdw 87 ; SDef
-	db "HUoRETOSU@@"
+	dname "HUoRETOSU", MON_NAME_LENGTH
 
 	db OMASTAR
 	db GOLD_BERRY
@@ -2065,7 +2065,7 @@ BattleTowerMons:
 	bigdw 83 ; Spd
 	bigdw 124 ; SAtk
 	bigdw 88 ; SDef
-	db "OMUSUTA-@@@"
+	dname "OMUSUTA-", MON_NAME_LENGTH
 
 	db CHARIZARD
 	db KINGS_ROCK
@@ -2091,7 +2091,7 @@ BattleTowerMons:
 	bigdw 119 ; Spd
 	bigdw 125 ; SAtk
 	bigdw 106 ; SDef
-	db "RIZA-DON@@@"
+	dname "RIZA-DON", MON_NAME_LENGTH
 
 	db EXEGGUTOR
 	db BRIGHTPOWDER
@@ -2117,7 +2117,7 @@ BattleTowerMons:
 	bigdw 82 ; Spd
 	bigdw 132 ; SAtk
 	bigdw 84 ; SDef
-	db "NAtuSI-@@@@"
+	dname "NAtuSI-", MON_NAME_LENGTH
 
 	db HYPNO
 	db BRIGHTPOWDER
@@ -2143,7 +2143,7 @@ BattleTowerMons:
 	bigdw 81 ; Spd
 	bigdw 88 ; SAtk
 	bigdw 122 ; SDef
-	db "SURI-PA-@@@"
+	dname "SURI-PA-", MON_NAME_LENGTH
 
 	db MUK
 	db QUICK_CLAW
@@ -2169,7 +2169,7 @@ BattleTowerMons:
 	bigdw 67 ; Spd
 	bigdw 83 ; SAtk
 	bigdw 111 ; SDef
-	db "BETOBETON@@"
+	dname "BETOBETON", MON_NAME_LENGTH
 
 	db ELECTABUZZ
 	db KINGS_ROCK
@@ -2195,7 +2195,7 @@ BattleTowerMons:
 	bigdw 111 ; Spd
 	bigdw 103 ; SAtk
 	bigdw 95 ; SDef
-	db "EREBU-@@@@@"
+	dname "EREBU-", MON_NAME_LENGTH
 
 
 ; BattleTowerMons group 5
@@ -2224,7 +2224,7 @@ BattleTowerMons:
 	bigdw 132 ; Spd
 	bigdw 144 ; SAtk
 	bigdw 144 ; SDef
-	db "KINGUDORA@@"
+	dname "KINGUDORA", MON_NAME_LENGTH
 
 	db HOUNDOOM
 	db MIRACLEBERRY
@@ -2250,7 +2250,7 @@ BattleTowerMons:
 	bigdw 145 ; Spd
 	bigdw 157 ; SAtk
 	bigdw 127 ; SDef
-	db "HERUGA-@@@@"
+	dname "HERUGA-", MON_NAME_LENGTH
 
 	db SHUCKLE
 	db LEFTOVERS
@@ -2276,7 +2276,7 @@ BattleTowerMons:
 	bigdw 52 ; Spd
 	bigdw 59 ; SAtk
 	bigdw 279 ; SDef
-	db "TUBOTUBO@@@"
+	dname "TUBOTUBO", MON_NAME_LENGTH
 
 	db SNORLAX
 	db LEFTOVERS
@@ -2302,7 +2302,7 @@ BattleTowerMons:
 	bigdw 79 ; Spd
 	bigdw 114 ; SAtk
 	bigdw 159 ; SDef
-	db "KABIGON@@@@"
+	dname "KABIGON", MON_NAME_LENGTH
 
 	db LAPRAS
 	db GOLD_BERRY
@@ -2328,7 +2328,7 @@ BattleTowerMons:
 	bigdw 107 ; Spd
 	bigdw 133 ; SAtk
 	bigdw 143 ; SDef
-	db "RAPURASU@@@"
+	dname "RAPURASU", MON_NAME_LENGTH
 
 	db JOLTEON
 	db KINGS_ROCK
@@ -2354,7 +2354,7 @@ BattleTowerMons:
 	bigdw 179 ; Spd
 	bigdw 159 ; SAtk
 	bigdw 144 ; SDef
-	db "SANDA-SU@@@"
+	dname "SANDA-SU", MON_NAME_LENGTH
 
 	db SCIZOR
 	db LEFTOVERS
@@ -2380,7 +2380,7 @@ BattleTowerMons:
 	bigdw 111 ; Spd
 	bigdw 99 ; SAtk
 	bigdw 124 ; SDef
-	db "HAtuSAMU@@@"
+	dname "HAtuSAMU", MON_NAME_LENGTH
 
 	db SLOWKING
 	db MINT_BERRY
@@ -2406,7 +2406,7 @@ BattleTowerMons:
 	bigdw 75 ; Spd
 	bigdw 146 ; SAtk
 	bigdw 156 ; SDef
-	db "YADOKINGU@@"
+	dname "YADOKINGU", MON_NAME_LENGTH
 
 	db MACHAMP
 	db GOLD_BERRY
@@ -2432,7 +2432,7 @@ BattleTowerMons:
 	bigdw 99 ; Spd
 	bigdw 108 ; SAtk
 	bigdw 128 ; SDef
-	db "KAIRIKI-@@@"
+	dname "KAIRIKI-", MON_NAME_LENGTH
 
 	db STARMIE
 	db SCOPE_LENS
@@ -2458,7 +2458,7 @@ BattleTowerMons:
 	bigdw 161 ; Spd
 	bigdw 145 ; SAtk
 	bigdw 130 ; SDef
-	db "SUTA-MI-@@@"
+	dname "SUTA-MI-", MON_NAME_LENGTH
 
 	db DUGTRIO
 	db KINGS_ROCK
@@ -2484,7 +2484,7 @@ BattleTowerMons:
 	bigdw 166 ; Spd
 	bigdw 96 ; SAtk
 	bigdw 116 ; SDef
-	db "DAGUTORIO@@"
+	dname "DAGUTORIO", MON_NAME_LENGTH
 
 	db ELECTRODE
 	db MIRACLEBERRY
@@ -2510,7 +2510,7 @@ BattleTowerMons:
 	bigdw 185 ; Spd
 	bigdw 126 ; SAtk
 	bigdw 126 ; SDef
-	db "MARUMAIN@@@"
+	dname "MARUMAIN", MON_NAME_LENGTH
 
 	db AERODACTYL
 	db KINGS_ROCK
@@ -2536,7 +2536,7 @@ BattleTowerMons:
 	bigdw 174 ; Spd
 	bigdw 104 ; SAtk
 	bigdw 119 ; SDef
-	db "PUTERA@@@@@"
+	dname "PUTERA", MON_NAME_LENGTH
 
 	db CROBAT
 	db LEFTOVERS
@@ -2562,7 +2562,7 @@ BattleTowerMons:
 	bigdw 175 ; Spd
 	bigdw 117 ; SAtk
 	bigdw 127 ; SDef
-	db "KUROBAtuTO@"
+	dname "KUROBAtuTO", MON_NAME_LENGTH
 
 	db ZAPDOS
 	db MIRACLEBERRY
@@ -2588,7 +2588,7 @@ BattleTowerMons:
 	bigdw 143 ; Spd
 	bigdw 171 ; SAtk
 	bigdw 136 ; SDef
-	db "SANDA-@@@@@"
+	dname "SANDA-", MON_NAME_LENGTH
 
 	db SKARMORY
 	db GOLD_BERRY
@@ -2614,7 +2614,7 @@ BattleTowerMons:
 	bigdw 116 ; Spd
 	bigdw 83 ; SAtk
 	bigdw 113 ; SDef
-	db "EA-MUDO@@@@"
+	dname "EA-MUDO", MON_NAME_LENGTH
 
 	db FORRETRESS
 	db LEFTOVERS
@@ -2640,7 +2640,7 @@ BattleTowerMons:
 	bigdw 84 ; Spd
 	bigdw 103 ; SAtk
 	bigdw 103 ; SDef
-	db "HUoRETOSU@@"
+	dname "HUoRETOSU", MON_NAME_LENGTH
 
 	db STEELIX
 	db MIRACLEBERRY
@@ -2666,7 +2666,7 @@ BattleTowerMons:
 	bigdw 73 ; Spd
 	bigdw 99 ; SAtk
 	bigdw 109 ; SDef
-	db "HAGANE-RU@@"
+	dname "HAGANE-RU", MON_NAME_LENGTH
 
 	db GIRAFARIG
 	db SCOPE_LENS
@@ -2692,7 +2692,7 @@ BattleTowerMons:
 	bigdw 120 ; Spd
 	bigdw 126 ; SAtk
 	bigdw 101 ; SDef
-	db "KIRINRIKI@@"
+	dname "KIRINRIKI", MON_NAME_LENGTH
 
 	db GYARADOS
 	db MIRACLEBERRY
@@ -2718,7 +2718,7 @@ BattleTowerMons:
 	bigdw 117 ; Spd
 	bigdw 95 ; SAtk
 	bigdw 135 ; SDef
-	db "GIyaRADOSU@"
+	dname "GIyaRADOSU", MON_NAME_LENGTH
 
 	db ARTICUNO
 	db GOLD_BERRY
@@ -2744,7 +2744,7 @@ BattleTowerMons:
 	bigdw 120 ; Spd
 	bigdw 131 ; SAtk
 	bigdw 161 ; SDef
-	db "HURI-ZA-@@@"
+	dname "HURI-ZA-", MON_NAME_LENGTH
 
 
 ; BattleTowerMons group 6
@@ -2773,7 +2773,7 @@ BattleTowerMons:
 	bigdw 161 ; Spd
 	bigdw 172 ; SAtk
 	bigdw 172 ; SDef
-	db "KINGUDORA@@"
+	dname "KINGUDORA", MON_NAME_LENGTH
 
 	db TYRANITAR
 	db GOLD_BERRY
@@ -2799,7 +2799,7 @@ BattleTowerMons:
 	bigdw 131 ; Spd
 	bigdw 169 ; SAtk
 	bigdw 175 ; SDef
-	db "BANGIRASU@@"
+	dname "BANGIRASU", MON_NAME_LENGTH
 
 	db HOUNDOOM
 	db MIRACLEBERRY
@@ -2825,7 +2825,7 @@ BattleTowerMons:
 	bigdw 172 ; Spd
 	bigdw 189 ; SAtk
 	bigdw 153 ; SDef
-	db "HERUGA-@@@@"
+	dname "HERUGA-", MON_NAME_LENGTH
 
 	db PORYGON2
 	db LEFTOVERS
@@ -2851,7 +2851,7 @@ BattleTowerMons:
 	bigdw 125 ; Spd
 	bigdw 182 ; SAtk
 	bigdw 170 ; SDef
-	db "PORIGON2@@@"
+	dname "PORIGON2", MON_NAME_LENGTH
 
 	db MACHAMP
 	db QUICK_CLAW
@@ -2877,7 +2877,7 @@ BattleTowerMons:
 	bigdw 120 ; Spd
 	bigdw 134 ; SAtk
 	bigdw 158 ; SDef
-	db "KAIRIKI-@@@"
+	dname "KAIRIKI-", MON_NAME_LENGTH
 
 	db ZAPDOS
 	db MINT_BERRY
@@ -2903,7 +2903,7 @@ BattleTowerMons:
 	bigdw 177 ; Spd
 	bigdw 203 ; SAtk
 	bigdw 161 ; SDef
-	db "SANDA-@@@@@"
+	dname "SANDA-", MON_NAME_LENGTH
 
 	db WOBBUFFET
 	db GOLD_BERRY
@@ -2929,7 +2929,7 @@ BattleTowerMons:
 	bigdw 94 ; Spd
 	bigdw 92 ; SAtk
 	bigdw 122 ; SDef
-	db "SO-NANSU@@@"
+	dname "SO-NANSU", MON_NAME_LENGTH
 
 	db AERODACTYL
 	db LEFTOVERS
@@ -2955,7 +2955,7 @@ BattleTowerMons:
 	bigdw 208 ; Spd
 	bigdw 124 ; SAtk
 	bigdw 142 ; SDef
-	db "PUTERA@@@@@"
+	dname "PUTERA", MON_NAME_LENGTH
 
 	db DRAGONITE
 	db MIRACLEBERRY
@@ -2981,7 +2981,7 @@ BattleTowerMons:
 	bigdw 152 ; Spd
 	bigdw 172 ; SAtk
 	bigdw 172 ; SDef
-	db "KAIRIyu-@@@"
+	dname "KAIRIyu-", MON_NAME_LENGTH
 
 	db UMBREON
 	db GOLD_BERRY
@@ -3007,7 +3007,7 @@ BattleTowerMons:
 	bigdw 132 ; Spd
 	bigdw 128 ; SAtk
 	bigdw 212 ; SDef
-	db "BURAtuKI-@@"
+	dname "BURAtuKI-", MON_NAME_LENGTH
 
 	db ARCANINE
 	db CHARCOAL
@@ -3033,7 +3033,7 @@ BattleTowerMons:
 	bigdw 170 ; Spd
 	bigdw 173 ; SAtk
 	bigdw 149 ; SDef
-	db "UINDEi@@@@@"
+	dname "UINDEi", MON_NAME_LENGTH
 
 	db SKARMORY
 	db MIRACLEBERRY
@@ -3059,7 +3059,7 @@ BattleTowerMons:
 	bigdw 138 ; Spd
 	bigdw 99 ; SAtk
 	bigdw 135 ; SDef
-	db "EA-MUDO@@@@"
+	dname "EA-MUDO", MON_NAME_LENGTH
 
 	db BLISSEY
 	db LEFTOVERS
@@ -3085,7 +3085,7 @@ BattleTowerMons:
 	bigdw 117 ; Spd
 	bigdw 143 ; SAtk
 	bigdw 215 ; SDef
-	db "HAPINASU@@@"
+	dname "HAPINASU", MON_NAME_LENGTH
 
 	db SNORLAX
 	db PINK_BOW
@@ -3111,7 +3111,7 @@ BattleTowerMons:
 	bigdw 92 ; Spd
 	bigdw 130 ; SAtk
 	bigdw 184 ; SDef
-	db "KABIGON@@@@"
+	dname "KABIGON", MON_NAME_LENGTH
 
 	db HERACROSS
 	db FOCUS_BAND
@@ -3137,7 +3137,7 @@ BattleTowerMons:
 	bigdw 156 ; Spd
 	bigdw 101 ; SAtk
 	bigdw 167 ; SDef
-	db "HERAKUROSU@"
+	dname "HERAKUROSU", MON_NAME_LENGTH
 
 	db JYNX
 	db MIRACLEBERRY
@@ -3163,7 +3163,7 @@ BattleTowerMons:
 	bigdw 168 ; Spd
 	bigdw 189 ; SAtk
 	bigdw 165 ; SDef
-	db "RU-ZIyuRA@@"
+	dname "RU-ZIyuRA", MON_NAME_LENGTH
 
 	db BLASTOISE
 	db GOLD_BERRY
@@ -3189,7 +3189,7 @@ BattleTowerMons:
 	bigdw 149 ; Spd
 	bigdw 156 ; SAtk
 	bigdw 180 ; SDef
-	db "KAMEtuKUSU@"
+	dname "KAMEtuKUSU", MON_NAME_LENGTH
 
 	db RHYDON
 	db QUICK_CLAW
@@ -3215,7 +3215,7 @@ BattleTowerMons:
 	bigdw 104 ; Spd
 	bigdw 104 ; SAtk
 	bigdw 104 ; SDef
-	db "SAIDON@@@@@"
+	dname "SAIDON", MON_NAME_LENGTH
 
 	db SANDSLASH
 	db SCOPE_LENS
@@ -3241,7 +3241,7 @@ BattleTowerMons:
 	bigdw 116 ; Spd
 	bigdw 93 ; SAtk
 	bigdw 105 ; SDef
-	db "SANDOPAN@@@"
+	dname "SANDOPAN", MON_NAME_LENGTH
 
 	db PARASECT
 	db GOLD_BERRY
@@ -3267,7 +3267,7 @@ BattleTowerMons:
 	bigdw 72 ; Spd
 	bigdw 120 ; SAtk
 	bigdw 144 ; SDef
-	db "PARASEKUTO@"
+	dname "PARASEKUTO", MON_NAME_LENGTH
 
 	db GOLEM
 	db BRIGHTPOWDER
@@ -3293,7 +3293,7 @@ BattleTowerMons:
 	bigdw 90 ; Spd
 	bigdw 105 ; SAtk
 	bigdw 117 ; SDef
-	db "GORO-NIya@@"
+	dname "GORO-NIya", MON_NAME_LENGTH
 
 
 ; BattleTowerMons group 7
@@ -3322,7 +3322,7 @@ BattleTowerMons:
 	bigdw 245 ; Spd
 	bigdw 222 ; SAtk
 	bigdw 201 ; SDef
-	db "SANDA-SU@@@"
+	dname "SANDA-SU", MON_NAME_LENGTH
 
 	db VAPOREON
 	db LEFTOVERS
@@ -3348,7 +3348,7 @@ BattleTowerMons:
 	bigdw 158 ; Spd
 	bigdw 218 ; SAtk
 	bigdw 197 ; SDef
-	db "SIyaWA-ZU@@"
+	dname "SIyaWA-ZU", MON_NAME_LENGTH
 
 	db UMBREON
 	db GOLD_BERRY
@@ -3374,7 +3374,7 @@ BattleTowerMons:
 	bigdw 152 ; Spd
 	bigdw 149 ; SAtk
 	bigdw 247 ; SDef
-	db "BURAtuKI-@@"
+	dname "BURAtuKI-", MON_NAME_LENGTH
 
 	db BLISSEY
 	db GOLD_BERRY
@@ -3400,7 +3400,7 @@ BattleTowerMons:
 	bigdw 143 ; Spd
 	bigdw 166 ; SAtk
 	bigdw 250 ; SDef
-	db "HAPINASU@@@"
+	dname "HAPINASU", MON_NAME_LENGTH
 
 	db SNORLAX
 	db LEFTOVERS
@@ -3426,7 +3426,7 @@ BattleTowerMons:
 	bigdw 105 ; Spd
 	bigdw 152 ; SAtk
 	bigdw 215 ; SDef
-	db "KABIGON@@@@"
+	dname "KABIGON", MON_NAME_LENGTH
 
 	db HOUNDOOM
 	db KINGS_ROCK
@@ -3452,7 +3452,7 @@ BattleTowerMons:
 	bigdw 197 ; Spd
 	bigdw 217 ; SAtk
 	bigdw 175 ; SDef
-	db "HERUGA-@@@@"
+	dname "HERUGA-", MON_NAME_LENGTH
 
 	db TYRANITAR
 	db LEFTOVERS
@@ -3478,7 +3478,7 @@ BattleTowerMons:
 	bigdw 147 ; Spd
 	bigdw 196 ; SAtk
 	bigdw 203 ; SDef
-	db "BANGIRASU@@"
+	dname "BANGIRASU", MON_NAME_LENGTH
 
 	db ZAPDOS
 	db GOLD_BERRY
@@ -3504,7 +3504,7 @@ BattleTowerMons:
 	bigdw 200 ; Spd
 	bigdw 238 ; SAtk
 	bigdw 189 ; SDef
-	db "SANDA-@@@@@"
+	dname "SANDA-", MON_NAME_LENGTH
 
 	db EXEGGUTOR
 	db MIRACLEBERRY
@@ -3530,7 +3530,7 @@ BattleTowerMons:
 	bigdw 140 ; Spd
 	bigdw 235 ; SAtk
 	bigdw 151 ; SDef
-	db "NAtuSI-@@@@"
+	dname "NAtuSI-", MON_NAME_LENGTH
 
 	db UMBREON
 	db GOLD_BERRY
@@ -3556,7 +3556,7 @@ BattleTowerMons:
 	bigdw 152 ; Spd
 	bigdw 142 ; SAtk
 	bigdw 240 ; SDef
-	db "BURAtuKI-@@"
+	dname "BURAtuKI-", MON_NAME_LENGTH
 
 	db GYARADOS
 	db BRIGHTPOWDER
@@ -3582,7 +3582,7 @@ BattleTowerMons:
 	bigdw 178 ; Spd
 	bigdw 148 ; SAtk
 	bigdw 204 ; SDef
-	db "GIyaRADOSU@"
+	dname "GIyaRADOSU", MON_NAME_LENGTH
 
 	db QUAGSIRE
 	db MIRACLEBERRY
@@ -3608,7 +3608,7 @@ BattleTowerMons:
 	bigdw 110 ; Spd
 	bigdw 152 ; SAtk
 	bigdw 152 ; SDef
-	db "NUO-@@@@@@@"
+	dname "NUO-", MON_NAME_LENGTH
 
 	db URSARING
 	db SCOPE_LENS
@@ -3634,7 +3634,7 @@ BattleTowerMons:
 	bigdw 138 ; Spd
 	bigdw 166 ; SAtk
 	bigdw 166 ; SDef
-	db "RINGUMA@@@@"
+	dname "RINGUMA", MON_NAME_LENGTH
 
 	db MR__MIME
 	db KINGS_ROCK
@@ -3660,7 +3660,7 @@ BattleTowerMons:
 	bigdw 190 ; Spd
 	bigdw 198 ; SAtk
 	bigdw 226 ; SDef
-	db "BARIYA-DO@@"
+	dname "BARIYA-DO", MON_NAME_LENGTH
 
 	db PRIMEAPE
 	db QUICK_CLAW
@@ -3686,7 +3686,7 @@ BattleTowerMons:
 	bigdw 196 ; Spd
 	bigdw 148 ; SAtk
 	bigdw 162 ; SDef
-	db "OKORIZARU@@"
+	dname "OKORIZARU", MON_NAME_LENGTH
 
 	db GIRAFARIG
 	db GOLD_BERRY
@@ -3712,7 +3712,7 @@ BattleTowerMons:
 	bigdw 183 ; Spd
 	bigdw 187 ; SAtk
 	bigdw 152 ; SDef
-	db "KIRINRIKI@@"
+	dname "KIRINRIKI", MON_NAME_LENGTH
 
 	db HITMONLEE
 	db FOCUS_BAND
@@ -3738,7 +3738,7 @@ BattleTowerMons:
 	bigdw 186 ; Spd
 	bigdw 112 ; SAtk
 	bigdw 217 ; SDef
-	db "SAWAMURA-@@"
+	dname "SAWAMURA-", MON_NAME_LENGTH
 
 	db HERACROSS
 	db BRIGHTPOWDER
@@ -3764,7 +3764,7 @@ BattleTowerMons:
 	bigdw 183 ; Spd
 	bigdw 109 ; SAtk
 	bigdw 186 ; SDef
-	db "HERAKUROSU@"
+	dname "HERAKUROSU", MON_NAME_LENGTH
 
 	db VENUSAUR
 	db BRIGHTPOWDER
@@ -3790,7 +3790,7 @@ BattleTowerMons:
 	bigdw 152 ; Spd
 	bigdw 180 ; SAtk
 	bigdw 180 ; SDef
-	db "HUSIGIBANA@"
+	dname "HUSIGIBANA", MON_NAME_LENGTH
 
 	db CHARIZARD
 	db SCOPE_LENS
@@ -3816,7 +3816,7 @@ BattleTowerMons:
 	bigdw 180 ; Spd
 	bigdw 193 ; SAtk
 	bigdw 159 ; SDef
-	db "RIZA-DON@@@"
+	dname "RIZA-DON", MON_NAME_LENGTH
 
 	db BLASTOISE
 	db QUICK_CLAW
@@ -3842,7 +3842,7 @@ BattleTowerMons:
 	bigdw 152 ; Spd
 	bigdw 159 ; SAtk
 	bigdw 187 ; SDef
-	db "KAMEtuKUSU@"
+	dname "KAMEtuKUSU", MON_NAME_LENGTH
 
 
 ; BattleTowerMons group 8
@@ -3871,7 +3871,7 @@ BattleTowerMons:
 	bigdw 281 ; Spd
 	bigdw 245 ; SAtk
 	bigdw 221 ; SDef
-	db "SANDA-SU@@@"
+	dname "SANDA-SU", MON_NAME_LENGTH
 
 	db SNORLAX
 	db LEFTOVERS
@@ -3897,7 +3897,7 @@ BattleTowerMons:
 	bigdw 121 ; Spd
 	bigdw 178 ; SAtk
 	bigdw 250 ; SDef
-	db "KABIGON@@@@"
+	dname "KABIGON", MON_NAME_LENGTH
 
 	db HOUNDOOM
 	db MINT_BERRY
@@ -3923,7 +3923,7 @@ BattleTowerMons:
 	bigdw 224 ; Spd
 	bigdw 245 ; SAtk
 	bigdw 197 ; SDef
-	db "HERUGA-@@@@"
+	dname "HERUGA-", MON_NAME_LENGTH
 
 	db TAUROS
 	db GOLD_BERRY
@@ -3949,7 +3949,7 @@ BattleTowerMons:
 	bigdw 236 ; Spd
 	bigdw 135 ; SAtk
 	bigdw 183 ; SDef
-	db "KENTAROSU@@"
+	dname "KENTAROSU", MON_NAME_LENGTH
 
 	db LAPRAS
 	db MINT_BERRY
@@ -3975,7 +3975,7 @@ BattleTowerMons:
 	bigdw 168 ; Spd
 	bigdw 202 ; SAtk
 	bigdw 218 ; SDef
-	db "RAPURASU@@@"
+	dname "RAPURASU", MON_NAME_LENGTH
 
 	db TYRANITAR
 	db MIRACLEBERRY
@@ -4001,7 +4001,7 @@ BattleTowerMons:
 	bigdw 169 ; Spd
 	bigdw 218 ; SAtk
 	bigdw 226 ; SDef
-	db "BANGIRASU@@"
+	dname "BANGIRASU", MON_NAME_LENGTH
 
 	db GENGAR
 	db NO_ITEM
@@ -4027,7 +4027,7 @@ BattleTowerMons:
 	bigdw 248 ; Spd
 	bigdw 277 ; SAtk
 	bigdw 189 ; SDef
-	db "GENGA-@@@@@"
+	dname "GENGA-", MON_NAME_LENGTH
 
 	db FORRETRESS
 	db LEFTOVERS
@@ -4053,7 +4053,7 @@ BattleTowerMons:
 	bigdw 133 ; Spd
 	bigdw 165 ; SAtk
 	bigdw 165 ; SDef
-	db "HUoRETOSU@@"
+	dname "HUoRETOSU", MON_NAME_LENGTH
 
 	db KINGDRA
 	db MINT_BERRY
@@ -4079,7 +4079,7 @@ BattleTowerMons:
 	bigdw 209 ; Spd
 	bigdw 221 ; SAtk
 	bigdw 221 ; SDef
-	db "KINGUDORA@@"
+	dname "KINGUDORA", MON_NAME_LENGTH
 
 	db DRAGONITE
 	db GOLD_BERRY
@@ -4105,7 +4105,7 @@ BattleTowerMons:
 	bigdw 197 ; Spd
 	bigdw 228 ; SAtk
 	bigdw 228 ; SDef
-	db "KAIRIyu-@@@"
+	dname "KAIRIyu-", MON_NAME_LENGTH
 
 	db PORYGON2
 	db LEFTOVERS
@@ -4131,7 +4131,7 @@ BattleTowerMons:
 	bigdw 169 ; Spd
 	bigdw 237 ; SAtk
 	bigdw 221 ; SDef
-	db "PORIGON2@@@"
+	dname "PORIGON2", MON_NAME_LENGTH
 
 	db JYNX
 	db QUICK_CLAW
@@ -4157,7 +4157,7 @@ BattleTowerMons:
 	bigdw 221 ; Spd
 	bigdw 257 ; SAtk
 	bigdw 225 ; SDef
-	db "RU-ZIyuRA@@"
+	dname "RU-ZIyuRA", MON_NAME_LENGTH
 
 	db MANTINE
 	db GOLD_BERRY
@@ -4183,7 +4183,7 @@ BattleTowerMons:
 	bigdw 180 ; Spd
 	bigdw 196 ; SAtk
 	bigdw 292 ; SDef
-	db "MANTAIN@@@@"
+	dname "MANTAIN", MON_NAME_LENGTH
 
 	db SKARMORY
 	db QUICK_CLAW
@@ -4209,7 +4209,7 @@ BattleTowerMons:
 	bigdw 183 ; Spd
 	bigdw 137 ; SAtk
 	bigdw 185 ; SDef
-	db "EA-MUDO@@@@"
+	dname "EA-MUDO", MON_NAME_LENGTH
 
 	db MOLTRES
 	db CHARCOAL
@@ -4235,7 +4235,7 @@ BattleTowerMons:
 	bigdw 213 ; Spd
 	bigdw 271 ; SAtk
 	bigdw 207 ; SDef
-	db "HUaIYA-@@@@"
+	dname "HUaIYA-", MON_NAME_LENGTH
 
 	db AERODACTYL
 	db MIRACLEBERRY
@@ -4261,7 +4261,7 @@ BattleTowerMons:
 	bigdw 275 ; Spd
 	bigdw 165 ; SAtk
 	bigdw 189 ; SDef
-	db "PUTERA@@@@@"
+	dname "PUTERA", MON_NAME_LENGTH
 
 	db ELECTRODE
 	db KINGS_ROCK
@@ -4287,7 +4287,7 @@ BattleTowerMons:
 	bigdw 291 ; Spd
 	bigdw 201 ; SAtk
 	bigdw 201 ; SDef
-	db "MARUMAIN@@@"
+	dname "MARUMAIN", MON_NAME_LENGTH
 
 	db DUGTRIO
 	db SCOPE_LENS
@@ -4313,7 +4313,7 @@ BattleTowerMons:
 	bigdw 261 ; Spd
 	bigdw 145 ; SAtk
 	bigdw 177 ; SDef
-	db "DAGUTORIO@@"
+	dname "DAGUTORIO", MON_NAME_LENGTH
 
 	db VICTREEBEL
 	db QUICK_CLAW
@@ -4339,7 +4339,7 @@ BattleTowerMons:
 	bigdw 161 ; Spd
 	bigdw 207 ; SAtk
 	bigdw 143 ; SDef
-	db "UTUBOtuTO@@"
+	dname "UTUBOtuTO", MON_NAME_LENGTH
 
 	db PINSIR
 	db GOLD_BERRY
@@ -4365,7 +4365,7 @@ BattleTowerMons:
 	bigdw 185 ; Spd
 	bigdw 133 ; SAtk
 	bigdw 157 ; SDef
-	db "KAIROSU@@@@"
+	dname "KAIROSU", MON_NAME_LENGTH
 
 	db GRANBULL
 	db BRIGHTPOWDER
@@ -4391,7 +4391,7 @@ BattleTowerMons:
 	bigdw 119 ; Spd
 	bigdw 146 ; SAtk
 	bigdw 146 ; SDef
-	db "GURANBURU@@"
+	dname "GURANBURU", MON_NAME_LENGTH
 
 
 ; BattleTowerMons group 9
@@ -4420,7 +4420,7 @@ BattleTowerMons:
 	bigdw 202 ; Spd
 	bigdw 188 ; SAtk
 	bigdw 314 ; SDef
-	db "BURAtuKI-@@"
+	dname "BURAtuKI-", MON_NAME_LENGTH
 
 	db DRAGONITE
 	db QUICK_CLAW
@@ -4446,7 +4446,7 @@ BattleTowerMons:
 	bigdw 229 ; Spd
 	bigdw 263 ; SAtk
 	bigdw 263 ; SDef
-	db "KAIRIyu-@@@"
+	dname "KAIRIyu-", MON_NAME_LENGTH
 
 	db STARMIE
 	db LEFTOVERS
@@ -4472,7 +4472,7 @@ BattleTowerMons:
 	bigdw 287 ; Spd
 	bigdw 263 ; SAtk
 	bigdw 236 ; SDef
-	db "SUTA-MI-@@@"
+	dname "SUTA-MI-", MON_NAME_LENGTH
 
 	db CLOYSTER
 	db LEFTOVERS
@@ -4498,7 +4498,7 @@ BattleTowerMons:
 	bigdw 203 ; Spd
 	bigdw 234 ; SAtk
 	bigdw 162 ; SDef
-	db "PARUSIeN@@@"
+	dname "PARUSIeN", MON_NAME_LENGTH
 
 	db CROBAT
 	db GOLD_BERRY
@@ -4524,7 +4524,7 @@ BattleTowerMons:
 	bigdw 310 ; Spd
 	bigdw 207 ; SAtk
 	bigdw 225 ; SDef
-	db "KUROBAtuTO@"
+	dname "KUROBAtuTO", MON_NAME_LENGTH
 
 	db PORYGON2
 	db QUICK_CLAW
@@ -4550,7 +4550,7 @@ BattleTowerMons:
 	bigdw 190 ; Spd
 	bigdw 266 ; SAtk
 	bigdw 248 ; SDef
-	db "PORIGON2@@@"
+	dname "PORIGON2", MON_NAME_LENGTH
 
 	db KINGDRA
 	db LEFTOVERS
@@ -4576,7 +4576,7 @@ BattleTowerMons:
 	bigdw 230 ; Spd
 	bigdw 248 ; SAtk
 	bigdw 248 ; SDef
-	db "KINGUDORA@@"
+	dname "KINGUDORA", MON_NAME_LENGTH
 
 	db TYRANITAR
 	db QUICK_CLAW
@@ -4602,7 +4602,7 @@ BattleTowerMons:
 	bigdw 185 ; Spd
 	bigdw 250 ; SAtk
 	bigdw 259 ; SDef
-	db "BANGIRASU@@"
+	dname "BANGIRASU", MON_NAME_LENGTH
 
 	db LAPRAS
 	db MINT_BERRY
@@ -4628,7 +4628,7 @@ BattleTowerMons:
 	bigdw 187 ; Spd
 	bigdw 237 ; SAtk
 	bigdw 255 ; SDef
-	db "RAPURASU@@@"
+	dname "RAPURASU", MON_NAME_LENGTH
 
 	db ESPEON
 	db GOLD_BERRY
@@ -4654,7 +4654,7 @@ BattleTowerMons:
 	bigdw 282 ; Spd
 	bigdw 313 ; SAtk
 	bigdw 250 ; SDef
-	db "E-HUi@@@@@@"
+	dname "E-HUi", MON_NAME_LENGTH
 
 	db MACHAMP
 	db QUICK_CLAW
@@ -4680,7 +4680,7 @@ BattleTowerMons:
 	bigdw 181 ; Spd
 	bigdw 194 ; SAtk
 	bigdw 230 ; SDef
-	db "KAIRIKI-@@@"
+	dname "KAIRIKI-", MON_NAME_LENGTH
 
 	db SNORLAX
 	db MIRACLEBERRY
@@ -4706,7 +4706,7 @@ BattleTowerMons:
 	bigdw 135 ; Spd
 	bigdw 194 ; SAtk
 	bigdw 275 ; SDef
-	db "KABIGON@@@@"
+	dname "KABIGON", MON_NAME_LENGTH
 
 	db ARCANINE
 	db MINT_BERRY
@@ -4732,7 +4732,7 @@ BattleTowerMons:
 	bigdw 247 ; Spd
 	bigdw 262 ; SAtk
 	bigdw 226 ; SDef
-	db "UINDEi@@@@@"
+	dname "UINDEi", MON_NAME_LENGTH
 
 	db BLISSEY
 	db LEFTOVERS
@@ -4758,7 +4758,7 @@ BattleTowerMons:
 	bigdw 180 ; Spd
 	bigdw 214 ; SAtk
 	bigdw 322 ; SDef
-	db "HAPINASU@@@"
+	dname "HAPINASU", MON_NAME_LENGTH
 
 	db HOUNDOOM
 	db BRIGHTPOWDER
@@ -4784,7 +4784,7 @@ BattleTowerMons:
 	bigdw 252 ; Spd
 	bigdw 277 ; SAtk
 	bigdw 223 ; SDef
-	db "HERUGA-@@@@"
+	dname "HERUGA-", MON_NAME_LENGTH
 
 	db SKARMORY
 	db QUICK_CLAW
@@ -4810,7 +4810,7 @@ BattleTowerMons:
 	bigdw 207 ; Spd
 	bigdw 139 ; SAtk
 	bigdw 193 ; SDef
-	db "EA-MUDO@@@@"
+	dname "EA-MUDO", MON_NAME_LENGTH
 
 	db SHUCKLE
 	db LEFTOVERS
@@ -4836,7 +4836,7 @@ BattleTowerMons:
 	bigdw 90 ; Spd
 	bigdw 97 ; SAtk
 	bigdw 493 ; SDef
-	db "TUBOTUBO@@@"
+	dname "TUBOTUBO", MON_NAME_LENGTH
 
 	db FLAREON
 	db MINT_BERRY
@@ -4862,7 +4862,7 @@ BattleTowerMons:
 	bigdw 198 ; Spd
 	bigdw 238 ; SAtk
 	bigdw 265 ; SDef
-	db "BU-SUTA-@@@"
+	dname "BU-SUTA-", MON_NAME_LENGTH
 
 	db MILTANK
 	db LEFTOVERS
@@ -4888,7 +4888,7 @@ BattleTowerMons:
 	bigdw 232 ; Spd
 	bigdw 128 ; SAtk
 	bigdw 182 ; SDef
-	db "MIRUTANKU@@"
+	dname "MIRUTANKU", MON_NAME_LENGTH
 
 	db TAUROS
 	db PINK_BOW
@@ -4914,7 +4914,7 @@ BattleTowerMons:
 	bigdw 254 ; Spd
 	bigdw 126 ; SAtk
 	bigdw 180 ; SDef
-	db "KENTAROSU@@"
+	dname "KENTAROSU", MON_NAME_LENGTH
 
 	db MUK
 	db QUICK_CLAW
@@ -4940,7 +4940,7 @@ BattleTowerMons:
 	bigdw 140 ; Spd
 	bigdw 167 ; SAtk
 	bigdw 230 ; SDef
-	db "BETOBETON@@"
+	dname "BETOBETON", MON_NAME_LENGTH
 
 
 ; BattleTowerMons group 10
@@ -4969,7 +4969,7 @@ BattleTowerMons:
 	bigdw 284 ; Spd
 	bigdw 312 ; SAtk
 	bigdw 252 ; SDef
-	db "HERUGA-@@@@"
+	dname "HERUGA-", MON_NAME_LENGTH
 
 	db MACHAMP
 	db QUICK_CLAW
@@ -4995,7 +4995,7 @@ BattleTowerMons:
 	bigdw 204 ; Spd
 	bigdw 226 ; SAtk
 	bigdw 266 ; SDef
-	db "KAIRIKI-@@@"
+	dname "KAIRIKI-", MON_NAME_LENGTH
 
 	db KINGDRA
 	db LEFTOVERS
@@ -5021,7 +5021,7 @@ BattleTowerMons:
 	bigdw 266 ; Spd
 	bigdw 284 ; SAtk
 	bigdw 284 ; SDef
-	db "KINGUDORA@@"
+	dname "KINGUDORA", MON_NAME_LENGTH
 
 	db JOLTEON
 	db BRIGHTPOWDER
@@ -5047,7 +5047,7 @@ BattleTowerMons:
 	bigdw 338 ; Spd
 	bigdw 308 ; SAtk
 	bigdw 278 ; SDef
-	db "SANDA-SU@@@"
+	dname "SANDA-SU", MON_NAME_LENGTH
 
 	db TAUROS
 	db KINGS_ROCK
@@ -5073,7 +5073,7 @@ BattleTowerMons:
 	bigdw 308 ; Spd
 	bigdw 170 ; SAtk
 	bigdw 230 ; SDef
-	db "KENTAROSU@@"
+	dname "KENTAROSU", MON_NAME_LENGTH
 
 	db ARCANINE
 	db LEFTOVERS
@@ -5099,7 +5099,7 @@ BattleTowerMons:
 	bigdw 281 ; Spd
 	bigdw 290 ; SAtk
 	bigdw 250 ; SDef
-	db "UINDEi@@@@@"
+	dname "UINDEi", MON_NAME_LENGTH
 
 	db CHARIZARD
 	db SCOPE_LENS
@@ -5125,7 +5125,7 @@ BattleTowerMons:
 	bigdw 289 ; Spd
 	bigdw 311 ; SAtk
 	bigdw 263 ; SDef
-	db "RIZA-DON@@@"
+	dname "RIZA-DON", MON_NAME_LENGTH
 
 	db ELECTRODE
 	db BRIGHTPOWDER
@@ -5151,7 +5151,7 @@ BattleTowerMons:
 	bigdw 366 ; Spd
 	bigdw 248 ; SAtk
 	bigdw 248 ; SDef
-	db "MARUMAIN@@@"
+	dname "MARUMAIN", MON_NAME_LENGTH
 
 	db RHYDON
 	db MIRACLEBERRY
@@ -5177,7 +5177,7 @@ BattleTowerMons:
 	bigdw 168 ; Spd
 	bigdw 178 ; SAtk
 	bigdw 178 ; SDef
-	db "SAIDON@@@@@"
+	dname "SAIDON", MON_NAME_LENGTH
 
 	db STEELIX
 	db LEFTOVERS
@@ -5203,7 +5203,7 @@ BattleTowerMons:
 	bigdw 152 ; Spd
 	bigdw 198 ; SAtk
 	bigdw 218 ; SDef
-	db "HAGANE-RU@@"
+	dname "HAGANE-RU", MON_NAME_LENGTH
 
 	db FEAROW
 	db KINGS_ROCK
@@ -5229,7 +5229,7 @@ BattleTowerMons:
 	bigdw 287 ; Spd
 	bigdw 212 ; SAtk
 	bigdw 212 ; SDef
-	db "ONIDORIRU@@"
+	dname "ONIDORIRU", MON_NAME_LENGTH
 
 	db MISDREAVUS
 	db FOCUS_BAND
@@ -5255,7 +5255,7 @@ BattleTowerMons:
 	bigdw 258 ; Spd
 	bigdw 263 ; SAtk
 	bigdw 263 ; SDef
-	db "MUUMA@@@@@@"
+	dname "MUUMA", MON_NAME_LENGTH
 
 	db SNEASEL
 	db SCOPE_LENS
@@ -5281,7 +5281,7 @@ BattleTowerMons:
 	bigdw 316 ; Spd
 	bigdw 160 ; SAtk
 	bigdw 240 ; SDef
-	db "NIyu-RA@@@@"
+	dname "NIyu-RA", MON_NAME_LENGTH
 
 	db SCIZOR
 	db QUICK_CLAW
@@ -5307,7 +5307,7 @@ BattleTowerMons:
 	bigdw 220 ; Spd
 	bigdw 196 ; SAtk
 	bigdw 246 ; SDef
-	db "HAtuSAMU@@@"
+	dname "HAtuSAMU", MON_NAME_LENGTH
 
 	db BLISSEY
 	db LEFTOVERS
@@ -5333,7 +5333,7 @@ BattleTowerMons:
 	bigdw 188 ; Spd
 	bigdw 226 ; SAtk
 	bigdw 346 ; SDef
-	db "HAPINASU@@@"
+	dname "HAPINASU", MON_NAME_LENGTH
 
 	db PILOSWINE
 	db MINT_BERRY
@@ -5359,7 +5359,7 @@ BattleTowerMons:
 	bigdw 190 ; Spd
 	bigdw 194 ; SAtk
 	bigdw 194 ; SDef
-	db "INOMU-@@@@@"
+	dname "INOMU-", MON_NAME_LENGTH
 
 	db EXEGGUTOR
 	db QUICK_CLAW
@@ -5385,7 +5385,7 @@ BattleTowerMons:
 	bigdw 200 ; Spd
 	bigdw 338 ; SAtk
 	bigdw 218 ; SDef
-	db "NAtuSI-@@@@"
+	dname "NAtuSI-", MON_NAME_LENGTH
 
 	db OMASTAR
 	db LEFTOVERS
@@ -5411,7 +5411,7 @@ BattleTowerMons:
 	bigdw 198 ; Spd
 	bigdw 304 ; SAtk
 	bigdw 214 ; SDef
-	db "OMUSUTA-@@@"
+	dname "OMUSUTA-", MON_NAME_LENGTH
 
 	db GOLEM
 	db BRIGHTPOWDER
@@ -5437,7 +5437,7 @@ BattleTowerMons:
 	bigdw 146 ; Spd
 	bigdw 170 ; SAtk
 	bigdw 190 ; SDef
-	db "GORO-NIya@@"
+	dname "GORO-NIya", MON_NAME_LENGTH
 
 	db HITMONCHAN
 	db FOCUS_BAND
@@ -5463,7 +5463,7 @@ BattleTowerMons:
 	bigdw 214 ; Spd
 	bigdw 130 ; SAtk
 	bigdw 280 ; SDef
-	db "EBIWARA-@@@"
+	dname "EBIWARA-", MON_NAME_LENGTH
 
 	db LANTURN
 	db QUICK_CLAW
@@ -5489,6 +5489,6 @@ BattleTowerMons:
 	bigdw 192 ; Spd
 	bigdw 214 ; SAtk
 	bigdw 214 ; SDef
-	db "RANTA-N@@@@"
+	dname "RANTA-N", MON_NAME_LENGTH
 
 	assert_table_length 10 * BATTLETOWER_NUM_UNIQUE_MON
diff --git a/data/events/npc_trades.asm b/data/events/npc_trades.asm
index 4890049f8..7bf68867f 100644
--- a/data/events/npc_trades.asm
+++ b/data/events/npc_trades.asm
@@ -1,18 +1,21 @@
 MACRO npctrade
 ; dialog set, requested mon, offered mon, nickname, dvs, item, OT ID, OT name, gender requested
-	db \1, \2, \3, \4, \5, \6, \7
+	db \1, \2, \3
+	dname \4, NAME_LENGTH
+	db \5, \6, \7
 	dw \8
-	db \9, \<10>, 0
+	dname \9, NAME_LENGTH
+	db \<10>, 0
 ENDM
 
 NPCTrades:
 ; entries correspond to NPCTRADE_* constants
 	table_width NPCTRADE_STRUCT_LENGTH
-	npctrade TRADE_DIALOGSET_COLLECTOR, ABRA,       MACHOP,     "MUSCLE@@@@@", $37, $66, GOLD_BERRY,   37460, "MIKE@@@@@@@", TRADE_GENDER_EITHER
-	npctrade TRADE_DIALOGSET_COLLECTOR, BELLSPROUT, ONIX,       "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_GENDER_EITHER
-	npctrade TRADE_DIALOGSET_HAPPY,     KRABBY,     VOLTORB,    "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_GENDER_EITHER
-	npctrade TRADE_DIALOGSET_GIRL,      DRAGONAIR,  DODRIO,     "DORIS@@@@@@", $77, $66, SMOKE_BALL,   00283, "EMY@@@@@@@@", TRADE_GENDER_FEMALE
-	npctrade TRADE_DIALOGSET_NEWBIE,    HAUNTER,    XATU,       "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_GENDER_EITHER
-	npctrade TRADE_DIALOGSET_GIRL,      CHANSEY,    AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY,   26491, "KIM@@@@@@@@", TRADE_GENDER_EITHER
-	npctrade TRADE_DIALOGSET_COLLECTOR, DUGTRIO,    MAGNETON,   "MAGGIE@@@@@", $96, $66, METAL_COAT,   50082, "FOREST@@@@@", TRADE_GENDER_EITHER
+	npctrade TRADE_DIALOGSET_COLLECTOR, ABRA,       MACHOP,     "MUSCLE", $37, $66, GOLD_BERRY,   37460, "MIKE",   TRADE_GENDER_EITHER
+	npctrade TRADE_DIALOGSET_COLLECTOR, BELLSPROUT, ONIX,       "ROCKY",  $96, $66, BITTER_BERRY, 48926, "KYLE",   TRADE_GENDER_EITHER
+	npctrade TRADE_DIALOGSET_HAPPY,     KRABBY,     VOLTORB,    "VOLTY",  $98, $88, PRZCUREBERRY, 29189, "TIM",    TRADE_GENDER_EITHER
+	npctrade TRADE_DIALOGSET_GIRL,      DRAGONAIR,  DODRIO,     "DORIS",  $77, $66, SMOKE_BALL,   00283, "EMY",    TRADE_GENDER_FEMALE
+	npctrade TRADE_DIALOGSET_NEWBIE,    HAUNTER,    XATU,       "PAUL",   $96, $86, MYSTERYBERRY, 15616, "CHRIS",  TRADE_GENDER_EITHER
+	npctrade TRADE_DIALOGSET_GIRL,      CHANSEY,    AERODACTYL, "AEROY",  $96, $66, GOLD_BERRY,   26491, "KIM",    TRADE_GENDER_EITHER
+	npctrade TRADE_DIALOGSET_COLLECTOR, DUGTRIO,    MAGNETON,   "MAGGIE", $96, $66, METAL_COAT,   50082, "FOREST", TRADE_GENDER_EITHER
 	assert_table_length NUM_NPC_TRADES
diff --git a/data/events/odd_eggs.asm b/data/events/odd_eggs.asm
index 155685bc1..fbd4b49c9 100644
--- a/data/events/odd_eggs.asm
+++ b/data/events/odd_eggs.asm
@@ -60,7 +60,7 @@ OddEggs:
 	bigdw 11 ; Spd
 	bigdw 8 ; SAtk
 	bigdw 8 ; SDef
-	db "EGG@@@@@@@@"
+	dname "EGG", MON_NAME_LENGTH
 
 	db PICHU
 	db NO_ITEM
@@ -86,7 +86,7 @@ OddEggs:
 	bigdw 12 ; Spd
 	bigdw 9 ; SAtk
 	bigdw 9 ; SDef
-	db "EGG@@@@@@@@"
+	dname "EGG", MON_NAME_LENGTH
 
 	db CLEFFA
 	db NO_ITEM
@@ -112,7 +112,7 @@ OddEggs:
 	bigdw 6 ; Spd
 	bigdw 9 ; SAtk
 	bigdw 10 ; SDef
-	db "EGG@@@@@@@@"
+	dname "EGG", MON_NAME_LENGTH
 
 	db CLEFFA
 	db NO_ITEM
@@ -138,7 +138,7 @@ OddEggs:
 	bigdw 7 ; Spd
 	bigdw 10 ; SAtk
 	bigdw 11 ; SDef
-	db "EGG@@@@@@@@"
+	dname "EGG", MON_NAME_LENGTH
 
 	db IGGLYBUFF
 	db NO_ITEM
@@ -164,7 +164,7 @@ OddEggs:
 	bigdw 6 ; Spd
 	bigdw 9 ; SAtk
 	bigdw 7 ; SDef
-	db "EGG@@@@@@@@"
+	dname "EGG", MON_NAME_LENGTH
 
 	db IGGLYBUFF
 	db NO_ITEM
@@ -190,7 +190,7 @@ OddEggs:
 	bigdw 7 ; Spd
 	bigdw 10 ; SAtk
 	bigdw 8 ; SDef
-	db "EGG@@@@@@@@"
+	dname "EGG", MON_NAME_LENGTH
 
 	db SMOOCHUM
 	db NO_ITEM
@@ -216,7 +216,7 @@ OddEggs:
 	bigdw 11 ; Spd
 	bigdw 13 ; SAtk
 	bigdw 11 ; SDef
-	db "EGG@@@@@@@@"
+	dname "EGG", MON_NAME_LENGTH
 
 	db SMOOCHUM
 	db NO_ITEM
@@ -242,7 +242,7 @@ OddEggs:
 	bigdw 12 ; Spd
 	bigdw 14 ; SAtk
 	bigdw 12 ; SDef
-	db "EGG@@@@@@@@"
+	dname "EGG", MON_NAME_LENGTH
 
 	db MAGBY
 	db NO_ITEM
@@ -268,7 +268,7 @@ OddEggs:
 	bigdw 13 ; Spd
 	bigdw 12 ; SAtk
 	bigdw 10 ; SDef
-	db "EGG@@@@@@@@"
+	dname "EGG", MON_NAME_LENGTH
 
 	db MAGBY
 	db NO_ITEM
@@ -294,7 +294,7 @@ OddEggs:
 	bigdw 14 ; Spd
 	bigdw 13 ; SAtk
 	bigdw 11 ; SDef
-	db "EGG@@@@@@@@"
+	dname "EGG", MON_NAME_LENGTH
 
 	db ELEKID
 	db NO_ITEM
@@ -320,7 +320,7 @@ OddEggs:
 	bigdw 14 ; Spd
 	bigdw 11 ; SAtk
 	bigdw 10 ; SDef
-	db "EGG@@@@@@@@"
+	dname "EGG", MON_NAME_LENGTH
 
 	db ELEKID
 	db NO_ITEM
@@ -346,7 +346,7 @@ OddEggs:
 	bigdw 15 ; Spd
 	bigdw 12 ; SAtk
 	bigdw 11 ; SDef
-	db "EGG@@@@@@@@"
+	dname "EGG", MON_NAME_LENGTH
 
 	db TYROGUE
 	db NO_ITEM
@@ -372,7 +372,7 @@ OddEggs:
 	bigdw 8 ; Spd
 	bigdw 8 ; SAtk
 	bigdw 8 ; SDef
-	db "EGG@@@@@@@@"
+	dname "EGG", MON_NAME_LENGTH
 
 	db TYROGUE
 	db NO_ITEM
@@ -398,6 +398,6 @@ OddEggs:
 	bigdw 9 ; Spd
 	bigdw 9 ; SAtk
 	bigdw 9 ; SDef
-	db "EGG@@@@@@@@"
+	dname "EGG", MON_NAME_LENGTH
 
 	assert_table_length NUM_ODD_EGGS
diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm
index 575ec1ef3..da8c36322 100644
--- a/data/pokemon/names.asm
+++ b/data/pokemon/names.asm
@@ -1,261 +1,261 @@
 PokemonNames::
 	table_width NAME_LENGTH - 1
-	db "BULBASAUR@"
-	db "IVYSAUR@@@"
-	db "VENUSAUR@@"
-	db "CHARMANDER"
-	db "CHARMELEON"
-	db "CHARIZARD@"
-	db "SQUIRTLE@@"
-	db "WARTORTLE@"
-	db "BLASTOISE@"
-	db "CATERPIE@@"
-	db "METAPOD@@@"
-	db "BUTTERFREE"
-	db "WEEDLE@@@@"
-	db "KAKUNA@@@@"
-	db "BEEDRILL@@"
-	db "PIDGEY@@@@"
-	db "PIDGEOTTO@"
-	db "PIDGEOT@@@"
-	db "RATTATA@@@"
-	db "RATICATE@@"
-	db "SPEAROW@@@"
-	db "FEAROW@@@@"
-	db "EKANS@@@@@"
-	db "ARBOK@@@@@"
-	db "PIKACHU@@@"
-	db "RAICHU@@@@"
-	db "SANDSHREW@"
-	db "SANDSLASH@"
-	db "NIDORAN♀@@"
-	db "NIDORINA@@"
-	db "NIDOQUEEN@"
-	db "NIDORAN♂@@"
-	db "NIDORINO@@"
-	db "NIDOKING@@"
-	db "CLEFAIRY@@"
-	db "CLEFABLE@@"
-	db "VULPIX@@@@"
-	db "NINETALES@"
-	db "JIGGLYPUFF"
-	db "WIGGLYTUFF"
-	db "ZUBAT@@@@@"
-	db "GOLBAT@@@@"
-	db "ODDISH@@@@"
-	db "GLOOM@@@@@"
-	db "VILEPLUME@"
-	db "PARAS@@@@@"
-	db "PARASECT@@"
-	db "VENONAT@@@"
-	db "VENOMOTH@@"
-	db "DIGLETT@@@"
-	db "DUGTRIO@@@"
-	db "MEOWTH@@@@"
-	db "PERSIAN@@@"
-	db "PSYDUCK@@@"
-	db "GOLDUCK@@@"
-	db "MANKEY@@@@"
-	db "PRIMEAPE@@"
-	db "GROWLITHE@"
-	db "ARCANINE@@"
-	db "POLIWAG@@@"
-	db "POLIWHIRL@"
-	db "POLIWRATH@"
-	db "ABRA@@@@@@"
-	db "KADABRA@@@"
-	db "ALAKAZAM@@"
-	db "MACHOP@@@@"
-	db "MACHOKE@@@"
-	db "MACHAMP@@@"
-	db "BELLSPROUT"
-	db "WEEPINBELL"
-	db "VICTREEBEL"
-	db "TENTACOOL@"
-	db "TENTACRUEL"
-	db "GEODUDE@@@"
-	db "GRAVELER@@"
-	db "GOLEM@@@@@"
-	db "PONYTA@@@@"
-	db "RAPIDASH@@"
-	db "SLOWPOKE@@"
-	db "SLOWBRO@@@"
-	db "MAGNEMITE@"
-	db "MAGNETON@@"
-	db "FARFETCH'D"
-	db "DODUO@@@@@"
-	db "DODRIO@@@@"
-	db "SEEL@@@@@@"
-	db "DEWGONG@@@"
-	db "GRIMER@@@@"
-	db "MUK@@@@@@@"
-	db "SHELLDER@@"
-	db "CLOYSTER@@"
-	db "GASTLY@@@@"
-	db "HAUNTER@@@"
-	db "GENGAR@@@@"
-	db "ONIX@@@@@@"
-	db "DROWZEE@@@"
-	db "HYPNO@@@@@"
-	db "KRABBY@@@@"
-	db "KINGLER@@@"
-	db "VOLTORB@@@"
-	db "ELECTRODE@"
-	db "EXEGGCUTE@"
-	db "EXEGGUTOR@"
-	db "CUBONE@@@@"
-	db "MAROWAK@@@"
-	db "HITMONLEE@"
-	db "HITMONCHAN"
-	db "LICKITUNG@"
-	db "KOFFING@@@"
-	db "WEEZING@@@"
-	db "RHYHORN@@@"
-	db "RHYDON@@@@"
-	db "CHANSEY@@@"
-	db "TANGELA@@@"
-	db "KANGASKHAN"
-	db "HORSEA@@@@"
-	db "SEADRA@@@@"
-	db "GOLDEEN@@@"
-	db "SEAKING@@@"
-	db "STARYU@@@@"
-	db "STARMIE@@@"
-	db "MR.MIME@@@"
-	db "SCYTHER@@@"
-	db "JYNX@@@@@@"
-	db "ELECTABUZZ"
-	db "MAGMAR@@@@"
-	db "PINSIR@@@@"
-	db "TAUROS@@@@"
-	db "MAGIKARP@@"
-	db "GYARADOS@@"
-	db "LAPRAS@@@@"
-	db "DITTO@@@@@"
-	db "EEVEE@@@@@"
-	db "VAPOREON@@"
-	db "JOLTEON@@@"
-	db "FLAREON@@@"
-	db "PORYGON@@@"
-	db "OMANYTE@@@"
-	db "OMASTAR@@@"
-	db "KABUTO@@@@"
-	db "KABUTOPS@@"
-	db "AERODACTYL"
-	db "SNORLAX@@@"
-	db "ARTICUNO@@"
-	db "ZAPDOS@@@@"
-	db "MOLTRES@@@"
-	db "DRATINI@@@"
-	db "DRAGONAIR@"
-	db "DRAGONITE@"
-	db "MEWTWO@@@@"
-	db "MEW@@@@@@@"
-	db "CHIKORITA@"
-	db "BAYLEEF@@@"
-	db "MEGANIUM@@"
-	db "CYNDAQUIL@"
-	db "QUILAVA@@@"
-	db "TYPHLOSION"
-	db "TOTODILE@@"
-	db "CROCONAW@@"
-	db "FERALIGATR"
-	db "SENTRET@@@"
-	db "FURRET@@@@"
-	db "HOOTHOOT@@"
-	db "NOCTOWL@@@"
-	db "LEDYBA@@@@"
-	db "LEDIAN@@@@"
-	db "SPINARAK@@"
-	db "ARIADOS@@@"
-	db "CROBAT@@@@"
-	db "CHINCHOU@@"
-	db "LANTURN@@@"
-	db "PICHU@@@@@"
-	db "CLEFFA@@@@"
-	db "IGGLYBUFF@"
-	db "TOGEPI@@@@"
-	db "TOGETIC@@@"
-	db "NATU@@@@@@"
-	db "XATU@@@@@@"
-	db "MAREEP@@@@"
-	db "FLAAFFY@@@"
-	db "AMPHAROS@@"
-	db "BELLOSSOM@"
-	db "MARILL@@@@"
-	db "AZUMARILL@"
-	db "SUDOWOODO@"
-	db "POLITOED@@"
-	db "HOPPIP@@@@"
-	db "SKIPLOOM@@"
-	db "JUMPLUFF@@"
-	db "AIPOM@@@@@"
-	db "SUNKERN@@@"
-	db "SUNFLORA@@"
-	db "YANMA@@@@@"
-	db "WOOPER@@@@"
-	db "QUAGSIRE@@"
-	db "ESPEON@@@@"
-	db "UMBREON@@@"
-	db "MURKROW@@@"
-	db "SLOWKING@@"
-	db "MISDREAVUS"
-	db "UNOWN@@@@@"
-	db "WOBBUFFET@"
-	db "GIRAFARIG@"
-	db "PINECO@@@@"
-	db "FORRETRESS"
-	db "DUNSPARCE@"
-	db "GLIGAR@@@@"
-	db "STEELIX@@@"
-	db "SNUBBULL@@"
-	db "GRANBULL@@"
-	db "QWILFISH@@"
-	db "SCIZOR@@@@"
-	db "SHUCKLE@@@"
-	db "HERACROSS@"
-	db "SNEASEL@@@"
-	db "TEDDIURSA@"
-	db "URSARING@@"
-	db "SLUGMA@@@@"
-	db "MAGCARGO@@"
-	db "SWINUB@@@@"
-	db "PILOSWINE@"
-	db "CORSOLA@@@"
-	db "REMORAID@@"
-	db "OCTILLERY@"
-	db "DELIBIRD@@"
-	db "MANTINE@@@"
-	db "SKARMORY@@"
-	db "HOUNDOUR@@"
-	db "HOUNDOOM@@"
-	db "KINGDRA@@@"
-	db "PHANPY@@@@"
-	db "DONPHAN@@@"
-	db "PORYGON2@@"
-	db "STANTLER@@"
-	db "SMEARGLE@@"
-	db "TYROGUE@@@"
-	db "HITMONTOP@"
-	db "SMOOCHUM@@"
-	db "ELEKID@@@@"
-	db "MAGBY@@@@@"
-	db "MILTANK@@@"
-	db "BLISSEY@@@"
-	db "RAIKOU@@@@"
-	db "ENTEI@@@@@"
-	db "SUICUNE@@@"
-	db "LARVITAR@@"
-	db "PUPITAR@@@"
-	db "TYRANITAR@"
-	db "LUGIA@@@@@"
-	db "HO-OH@@@@@"
-	db "CELEBI@@@@"
+	dname "BULBASAUR"
+	dname "IVYSAUR"
+	dname "VENUSAUR"
+	dname "CHARMANDER"
+	dname "CHARMELEON"
+	dname "CHARIZARD"
+	dname "SQUIRTLE"
+	dname "WARTORTLE"
+	dname "BLASTOISE"
+	dname "CATERPIE"
+	dname "METAPOD"
+	dname "BUTTERFREE"
+	dname "WEEDLE"
+	dname "KAKUNA"
+	dname "BEEDRILL"
+	dname "PIDGEY"
+	dname "PIDGEOTTO"
+	dname "PIDGEOT"
+	dname "RATTATA"
+	dname "RATICATE"
+	dname "SPEAROW"
+	dname "FEAROW"
+	dname "EKANS"
+	dname "ARBOK"
+	dname "PIKACHU"
+	dname "RAICHU"
+	dname "SANDSHREW"
+	dname "SANDSLASH"
+	dname "NIDORAN♀"
+	dname "NIDORINA"
+	dname "NIDOQUEEN"
+	dname "NIDORAN♂"
+	dname "NIDORINO"
+	dname "NIDOKING"
+	dname "CLEFAIRY"
+	dname "CLEFABLE"
+	dname "VULPIX"
+	dname "NINETALES"
+	dname "JIGGLYPUFF"
+	dname "WIGGLYTUFF"
+	dname "ZUBAT"
+	dname "GOLBAT"
+	dname "ODDISH"
+	dname "GLOOM"
+	dname "VILEPLUME"
+	dname "PARAS"
+	dname "PARASECT"
+	dname "VENONAT"
+	dname "VENOMOTH"
+	dname "DIGLETT"
+	dname "DUGTRIO"
+	dname "MEOWTH"
+	dname "PERSIAN"
+	dname "PSYDUCK"
+	dname "GOLDUCK"
+	dname "MANKEY"
+	dname "PRIMEAPE"
+	dname "GROWLITHE"
+	dname "ARCANINE"
+	dname "POLIWAG"
+	dname "POLIWHIRL"
+	dname "POLIWRATH"
+	dname "ABRA"
+	dname "KADABRA"
+	dname "ALAKAZAM"
+	dname "MACHOP"
+	dname "MACHOKE"
+	dname "MACHAMP"
+	dname "BELLSPROUT"
+	dname "WEEPINBELL"
+	dname "VICTREEBEL"
+	dname "TENTACOOL"
+	dname "TENTACRUEL"
+	dname "GEODUDE"
+	dname "GRAVELER"
+	dname "GOLEM"
+	dname "PONYTA"
+	dname "RAPIDASH"
+	dname "SLOWPOKE"
+	dname "SLOWBRO"
+	dname "MAGNEMITE"
+	dname "MAGNETON"
+	dname "FARFETCH'D"
+	dname "DODUO"
+	dname "DODRIO"
+	dname "SEEL"
+	dname "DEWGONG"
+	dname "GRIMER"
+	dname "MUK"
+	dname "SHELLDER"
+	dname "CLOYSTER"
+	dname "GASTLY"
+	dname "HAUNTER"
+	dname "GENGAR"
+	dname "ONIX"
+	dname "DROWZEE"
+	dname "HYPNO"
+	dname "KRABBY"
+	dname "KINGLER"
+	dname "VOLTORB"
+	dname "ELECTRODE"
+	dname "EXEGGCUTE"
+	dname "EXEGGUTOR"
+	dname "CUBONE"
+	dname "MAROWAK"
+	dname "HITMONLEE"
+	dname "HITMONCHAN"
+	dname "LICKITUNG"
+	dname "KOFFING"
+	dname "WEEZING"
+	dname "RHYHORN"
+	dname "RHYDON"
+	dname "CHANSEY"
+	dname "TANGELA"
+	dname "KANGASKHAN"
+	dname "HORSEA"
+	dname "SEADRA"
+	dname "GOLDEEN"
+	dname "SEAKING"
+	dname "STARYU"
+	dname "STARMIE"
+	dname "MR.MIME"
+	dname "SCYTHER"
+	dname "JYNX"
+	dname "ELECTABUZZ"
+	dname "MAGMAR"
+	dname "PINSIR"
+	dname "TAUROS"
+	dname "MAGIKARP"
+	dname "GYARADOS"
+	dname "LAPRAS"
+	dname "DITTO"
+	dname "EEVEE"
+	dname "VAPOREON"
+	dname "JOLTEON"
+	dname "FLAREON"
+	dname "PORYGON"
+	dname "OMANYTE"
+	dname "OMASTAR"
+	dname "KABUTO"
+	dname "KABUTOPS"
+	dname "AERODACTYL"
+	dname "SNORLAX"
+	dname "ARTICUNO"
+	dname "ZAPDOS"
+	dname "MOLTRES"
+	dname "DRATINI"
+	dname "DRAGONAIR"
+	dname "DRAGONITE"
+	dname "MEWTWO"
+	dname "MEW"
+	dname "CHIKORITA"
+	dname "BAYLEEF"
+	dname "MEGANIUM"
+	dname "CYNDAQUIL"
+	dname "QUILAVA"
+	dname "TYPHLOSION"
+	dname "TOTODILE"
+	dname "CROCONAW"
+	dname "FERALIGATR"
+	dname "SENTRET"
+	dname "FURRET"
+	dname "HOOTHOOT"
+	dname "NOCTOWL"
+	dname "LEDYBA"
+	dname "LEDIAN"
+	dname "SPINARAK"
+	dname "ARIADOS"
+	dname "CROBAT"
+	dname "CHINCHOU"
+	dname "LANTURN"
+	dname "PICHU"
+	dname "CLEFFA"
+	dname "IGGLYBUFF"
+	dname "TOGEPI"
+	dname "TOGETIC"
+	dname "NATU"
+	dname "XATU"
+	dname "MAREEP"
+	dname "FLAAFFY"
+	dname "AMPHAROS"
+	dname "BELLOSSOM"
+	dname "MARILL"
+	dname "AZUMARILL"
+	dname "SUDOWOODO"
+	dname "POLITOED"
+	dname "HOPPIP"
+	dname "SKIPLOOM"
+	dname "JUMPLUFF"
+	dname "AIPOM"
+	dname "SUNKERN"
+	dname "SUNFLORA"
+	dname "YANMA"
+	dname "WOOPER"
+	dname "QUAGSIRE"
+	dname "ESPEON"
+	dname "UMBREON"
+	dname "MURKROW"
+	dname "SLOWKING"
+	dname "MISDREAVUS"
+	dname "UNOWN"
+	dname "WOBBUFFET"
+	dname "GIRAFARIG"
+	dname "PINECO"
+	dname "FORRETRESS"
+	dname "DUNSPARCE"
+	dname "GLIGAR"
+	dname "STEELIX"
+	dname "SNUBBULL"
+	dname "GRANBULL"
+	dname "QWILFISH"
+	dname "SCIZOR"
+	dname "SHUCKLE"
+	dname "HERACROSS"
+	dname "SNEASEL"
+	dname "TEDDIURSA"
+	dname "URSARING"
+	dname "SLUGMA"
+	dname "MAGCARGO"
+	dname "SWINUB"
+	dname "PILOSWINE"
+	dname "CORSOLA"
+	dname "REMORAID"
+	dname "OCTILLERY"
+	dname "DELIBIRD"
+	dname "MANTINE"
+	dname "SKARMORY"
+	dname "HOUNDOUR"
+	dname "HOUNDOOM"
+	dname "KINGDRA"
+	dname "PHANPY"
+	dname "DONPHAN"
+	dname "PORYGON2"
+	dname "STANTLER"
+	dname "SMEARGLE"
+	dname "TYROGUE"
+	dname "HITMONTOP"
+	dname "SMOOCHUM"
+	dname "ELEKID"
+	dname "MAGBY"
+	dname "MILTANK"
+	dname "BLISSEY"
+	dname "RAIKOU"
+	dname "ENTEI"
+	dname "SUICUNE"
+	dname "LARVITAR"
+	dname "PUPITAR"
+	dname "TYRANITAR"
+	dname "LUGIA"
+	dname "HO-OH"
+	dname "CELEBI"
 	assert_table_length NUM_POKEMON
-	db "?????@@@@@"
-	db "EGG@@@@@@@"
+	dname "?????"
+	dname "EGG"
 	assert_table_length EGG
-	db "?????@@@@@"
-	db "?????@@@@@"
-	db "?????@@@@@"
+	dname "?????"
+	dname "?????"
+	dname "?????"
 	assert_table_length $100
diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm
index b8e0e5c48..ca62149ba 100644
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -1307,7 +1307,7 @@ endr
 	ret
 
 String_MysteryJP:
-	db "なぞナゾ@@" ; MYSTERY
+	dname "なぞナゾ", NAME_LENGTH_JAPANESE ; "MYSTERY"
 
 BattleTowerAction_0F:
 	ldh a, [rWBK]
diff --git a/engine/events/odd_egg.asm b/engine/events/odd_egg.asm
index f30bc1b02..355d690d6 100644
--- a/engine/events/odd_egg.asm
+++ b/engine/events/odd_egg.asm
@@ -91,6 +91,6 @@ _GiveOddEgg:
 	ret
 
 .Odd:
-	db "ODD@@@@@@@@@"
+	dname "ODD", MON_NAME_LENGTH + 1
 
 INCLUDE "data/events/odd_eggs.asm"
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index 8f3d207b6..91cce62cb 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -780,9 +780,9 @@ NamePlayer:
 	ret
 
 .Chris:
-	db "CHRIS@@@@@@"
+	dname "CHRIS", NAME_LENGTH
 .Kris:
-	db "KRIS@@@@@@@"
+	dname "KRIS", NAME_LENGTH
 
 GSShowPlayerNamingChoices: ; unreferenced
 	call LoadMenuHeader
diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm
index 0cb594857..137cd6a72 100644
--- a/engine/movie/trade_animation.asm
+++ b/engine/movie/trade_animation.asm
@@ -1430,13 +1430,14 @@ DebugTrade: ; unreferenced
 
 MACRO debugtrade
 ; species, ot name, ot id
-	db \1, \2
+	db \1
+	dname \2, NAME_LENGTH_JAPANESE
 	dw \3
 ENDM
 
 .DebugTradeData:
-	debugtrade VENUSAUR,  "ゲーフり@@", $0123 ; GAME FREAK
-	debugtrade CHARIZARD, "クりーチャ@", $0456 ; Creatures Inc.
+	debugtrade VENUSAUR,  "ゲーフり",  $0123 ; GAME FREAK
+	debugtrade CHARIZARD, "クりーチャ", $0456 ; Creatures Inc.
 
 TradeGameBoyTilemap:  INCBIN "gfx/trade/game_boy.tilemap" ; 6x8
 TradeLinkTubeTilemap: INCBIN "gfx/trade/link_cable.tilemap" ; 12x3
diff --git a/engine/pokemon/correct_party_errors.asm b/engine/pokemon/correct_party_errors.asm
index c10be0910..1a82413e9 100644
--- a/engine/pokemon/correct_party_errors.asm
+++ b/engine/pokemon/correct_party_errors.asm
@@ -203,7 +203,7 @@ CorrectPartyErrors: ; unreferenced
 	ret
 
 .TAMAGO:
-	db "タマゴ@@@"
+	dname "タマゴ", NAME_LENGTH_JAPANESE ; "EGG"
 
 .GetLengthOfStringWith6CharCap:
 	push de
diff --git a/macros/data.asm b/macros/data.asm
index a952eae57..134d38b67 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -108,6 +108,18 @@ MACRO dba_pics ; front, back
 	endc
 ENDM
 
+MACRO dname
+	if _NARG == 2
+		def n = \2
+	else
+		def n = NAME_LENGTH - 1
+	endc
+	assert STRFIND(\1, "@") == -1, "String terminator \"@\" in name: \1"
+	assert CHARLEN(\1) <= n, "Name longer than {d:n} characters: \1"
+	db \1
+	ds n - CHARLEN(\1), "@"
+ENDM
+
 MACRO bcd
 	rept _NARG
 		dn ((\1) % 100) / 10, (\1) % 10
diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm
index 1ddf8ed9a..33bf544c3 100644
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -1704,13 +1704,13 @@ DebugMobileTrade: ; unreferenced
 
 .DebugTradeData:
 	db VENUSAUR
-	db "ゲーフり@@"
+	dname "ゲーフり", NAME_LENGTH_JAPANESE ; "GEEFURI" (Game Freak)
 	dw $0123
-	db "かびーん@@"
+	dname "かびーん", NAME_LENGTH_JAPANESE ; "KABIIN"
 	db CHARIZARD
-	db "クりーチャ@"
+	dname "クりーチャ", NAME_LENGTH_JAPANESE ; "CREATURE"
 	dw $0456
-	db "マツミヤ@@"
+	dname "マツミヤ", NAME_LENGTH_JAPANESE ; "MATSUMIYA"
 
 LoadMobileAdapterPalette:
 	ld a, [wc74e]
diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm
index 0e075667f..f48ca3f10 100644
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -330,7 +330,7 @@ Mobile_CopyDefaultOTName:
 	ret
 
 Mobile5F_PlayersName:
-	db "クりス@@"
+	dname "クりス", NAME_LENGTH_JAPANESE - 1
 
 Mobile_CopyDefaultNickname:
 	ld hl, .DefaultNickname
@@ -340,7 +340,7 @@ Mobile_CopyDefaultNickname:
 	ret
 
 .DefaultNickname:
-	db "？？？？？"
+	dname "？？？？？", NAME_LENGTH_JAPANESE - 1
 
 Mobile_CopyDefaultMail:
 	ld a, "@"